Various additions from noether
Merge branch 'master' of github.com:metasoarous/dotfiles