Merge branch 'master', remote-tracking branch 'upstream/master'
Fixed up the config file path and setup script for Snap
Merge pull request #60 from stevely/master

Updated code for Snap framework