Added machine specific config files
Updating for the Ubuntu stuff
Merge branch 'master' of ssh://troot/Users/troot/TrootskiEnvConf/
Merge branch 'master' of ssh://troot/Users/troot/TrootskiEnvConf/

Conflicts:
	.vim/bundle/ctrlp
Merge branch 'master' of ssh://troot/Users/troot/TrootskiEnvConf/
Merge branch 'master' of ssh://troot/Users/troot/TrootskiEnvConf/
Merge branch 'master' of github.com:trootski/TrootskiEnvConf
Merged with head