cleaning things up a bit for merge

aliases/available/general.aliases.bash

@@ -23,17 +23,6 @@ alias vigen="vim ~/.bash_it/aliases/available/general.aliases.bash"
 alias vbrc="vim ~/.bashrc"
 alias vbpf="vim ~/.bash_profile"
 
-# vmpooler
-function vm-grab() {
-    printf "Hello! You rule. Which vm would you like?: "
-    read vm_msg
-    LDAP_USERNAME=rod LDAP_PASSWORD=$(python -c 'import getpass;print(getpass.getpass())') vmpool grab "$vm_msg"
-}
-
-function vm-list() {
-LDAP_USERNAME=rod LDAP_PASSWORD=$(python -c 'import getpass;print(getpass.getpass())') vmpool list
-}
-
 # colored grep
 # Need to check an existing file for a pattern that will be found to ensure
 # that the check works when on an OS that supports the color option
@@ -96,7 +85,6 @@ alias batbsh='bash-it'
 alias babsh='bash-it'
 alias bash_it='bash-it'
 alias bash_ti='bash-it'
-alias bsh='bash-it'
 
 # Additional bash-it aliases for help/show
 alias bshsa='bash-it show aliases'

aliases/available/vagrant.aliases.bash

@@ -7,8 +7,6 @@ alias vscp='vaagrant scp'
 alias vsl='vagrant snapshot list'
 alias vst='vagrant snapshot take'
 alias vup="vagrant up"
-alias vupo="vagrant up $@ --provider=openstack"
-alias vupv="vagrant up $@ --provider=vsphere"
 alias vupl="vagrant up 2>&1 | tee vagrant.log"
 alias vh="vagrant halt"
 alias vs="vagrant suspend"
@@ -23,4 +21,3 @@ alias vdstr="vagrant destroy"
 alias vl="vagrant list"
 # requires vagrant-hostmanager plugin
 alias vhst="vagrant hostmanager"
-alias svop="source openrc.sh && source vsphere-rc.sh"