go with conventional indent settings
Merge branch 'master' of https://github.com/jdonaldson/dotfiles