Added a config option for the max number of pixels in an uploaded image (5 megapixels by default)
Merge branch 'master' into heroku
Added Godeps