vim: added pathogen and coffee-script plugins
Cleaned up bootstrap
Merge master into mac