Prettify all the vcs!
Merge branch 'weswigham-prettify'
Merge