Merge Nicks style guide

The only conflicting change is for attributes using 4 indents instead of 3. But this at least gets the conversation about the merge of my style guide going.