Text watermarks work, polish + docs needed
Merge branch 'master' into heroku
Added Godeps