Merge pull request #5 from RSEmail/cleanup-and-fix

Major refactoring.
Merge branch 'master' into berkshelf