resyncing macair with master
Merge branch 'master' of https://github.com/frap/emacs-live-packs
Added chnages to gas-clocking