Merge pull request #104 from kbourgoin/master

Another omnibus PR. [Fixes #45] [Fixes #102]
Merge branch 'master' of github.com:getsamsa/samsa