Minor fixes and refactoring
Merge branch 'master' of https://github.com/tyler-hoffman/ventriloquist.git