additional clean up for the enter key and logging
Merge branch 'master' of github.com:jsking/witch-e