Some minor tweaks
Added coffeescript recognition in vim
Basic gitconfig
Merge remote-tracking branch 'origin/master'