update for macros.conf and apps.conf support. ubooly ssh config
Merge branch 'master' of ssh://git.peterlyons.com/home/plyons/projects/dotfiles