Stuff and junk
Merge branch 'master' of github.com:nummi/my-config