Lots and lots of polish

This pull request is for a formal review across teams, but I believe everything should be merged. Please provide feedback so I can amend commits if necessary!

You can see the end result of a full merge here: http://jeffturcotte.github.io/boilerplate/

Thanks.