Fixing issue when merging from master to demo

Added --no-edit option to the git merge commands. Previously it was causing the merge to hang on mine and Eve's machines. --no-edit removes the ability for the user to add a commit message when merging (which isn't needed anyway).

Bumped gem version to 1.0.8