Merge in extra updates from work account
Make variables for ede-cmake stuff
Merge branch 'master' of github.com:randomphrase/dotfiles