add ~/.hammerspoon to package.path
Fix up require paths to be more consistent, and collapsed into a single step. Also print out the resulting paths. Also tidy up wording in another startup message
Fix up merge