Fixed some errors. Cleaned up
Merge branch 'master' of github.com:metashock/phish