Touch up some independents
Reindent/reorder
Merge branch 'master' of git://github.com/citation-style-language/styles