Cleaned up formatting (1/2) and updated dependencies

[clojens]

I'll see if I can clean up some of the 80 lines sometime but really think it's too much work. This wasn't tho.

[daveray]

Hi. Two things:

• It looks like you made all these changes on master rather than develop hence all the "Merge branch xxx" commits in the pull request. Could you make these changes on develop?
• There are a lot of similar or non-descriptive commits here. Could you squash them into a single commit, or smaller set of focused commits?

Thanks!