Watermarks can be centred, position set using gravity now
Gravity position for text overlays + some fixes
Merge branch 'master' into heroku