coffee-scriptのシンタックスを追加, 一部拡張子で;と:の入れ替え
Merge branch 'master' of github.com:saxsir/dotfiles

Conflicts:
	vimrc