Updated git.scmbrc to comply with new version (fixes shortcuts)
Added Nginx setting files hilighting for Vim
Merge branch 'master' of github.com:anttihirvonen/dotfiles