Modify deploy to handle emacs config
Merge from master