Cleanup and bug fixes.
Merge branch 'master' of github.com:jmervine/phantomjs-tools