A bunch of stuff from home
Merge remote master
Merge branch 'master' into laptop
Fix git config for laptop