Adds go syntax
Merge branch 'master' of github.com:gmiller2007/dotfiles
Fixes merge issues.