misc long term updates
Merge branch 'master' of github.com:whoughton/dotfiles