Deleted snippets that were causing issues
Merge branch 'master' of github.com:trootski/TrootskiEnvConf
Updated config files for Ubuntu support
Fixing a few Ubuntu related issues
Removed a file that doesn't need to be tracked
starting to put together a setup script
Merge branch 'master' of ssh://troot-imac/Users/byrne/TrootskiEnvConf/

Conflicts:
	.gitignore
Added ctrlp to vim
Fixed up an old mergei
Cleaning up my vim directory
Added the runtime path
Added the ctrlp plugin as a sub-module
Added NerdTree
Added shipmate
Added vim-javascript
Added tag list
Added vim-airline
Added vim-gitgutter
Cleaned up the config file a bit
Removed the old vim stuff