Reindent all the things. Also tweak style.rb
Resolve merge conflicts
Merge branch 'Trevoke-master'