prosjekt updates
Merge branch 'master' of http://github.com/abingham/emacs_config