Merge pull request #2 from scottferg/master

Code cleanup
Merge pull request #3 from scottferg/master

Added more tests
Merge branch 'master' of github.com:vokalinteractive/vip
Remove unused import
Add dockerfile