Merge coming up...
forgot config script
Merge branch 'master' of https://github.com/jmcomets/projects
supertab removed, vimrc updated