Vim 7.4a, airline instead of my custom statusline, add vim-coffeescript
Module updates.
Bundle updates.
New airline theme. Turn off stupid whitespace detection it added.
Merge commit '0049a9e890413a49435952713f0e87bd8e5026fe' into osx

Conflicts:
	.vimrc