A couple updates
Merge http://github.com/globby/screenshot
Added a couple things