Add --allow-empty to travis commit so as to stop build failing if there's nothing to commit
Travis - Merging changes
Travis - Committing built assets