Split overlong lines
Update to work with default ".hsenv" directory
Fix Emacs support

This has been broken since the reintroduction of single-sandbox mode in
c5922debe858d4b2c259161ddf7aecdb3bafb5df.

Merge remote-tracking branch 'github/nominolo/master'