Ugh conflicts
Merge branch 'master' of github.com:IanFinlayson/config
Small chanfe.