Don't invoke editor for deploy merges

Signed-off-by: Rohan Jain <crodjer@gmail.com>
Merge branch 'master' into gh-pages