Merge master
Merge emacs cookbooks
Add ntp