Always do a --no-ff merge for branches called "production"
Upgrade to PHP 5.5
Add a quick shortcut command to git pull rebase a specified branch