updated.
Merge branch 'master' of github.com:soundkitchen/home

Conflicts:
	.vim/syntax/coffee.vim
	.vimrc
Merge branch 'master' into osx
updated