Changes from ASGARD
Merge branch 'master' of github.com:eddess/dotEmacsdotD