merge
Merge branch 'master' of github:serialize/dotfiles
moved functions to new structure
changed script names to app contexts