Only perform fast_forward if remote branch exists
Merge pull request #168 from sbesson/travis_merge_emergency

Only perform fast_forward if remote branch exists