add web3
Merge branch 'master' of github.com:twinge/dotfiles
update aliases
change web4 to web2
update mh aliases
M198.101.238.99erge branch 'master' of github.com:twinge/dotfiles
customize vimrc
don't use color option for rspec
add mpdx servers
add heroku to path
change default location of deploy app
Merge branch 'master' of github.com:twinge/dotfiles

Conflicts:
	bashrc
new IP for pg1
new mpdx server
Add alias for mpdxs
Add mh3
Update aliases
Merge branch 'master' of github.com:twinge/dotfiles
Update resque server ip
Update aliases