Upgrade to use Snap instead of Happstack
Merge branch 'dev'