Added cmake-mode ess-mode
Better check on machine name
Merge branch 'master' of github.com:XL64/my-scripts-and-config