add sphinx task to capistrano config
merge conflict fix