Merge and cleanup branch, push to remote

Previously git finish did nothing.  This change makes git finish merge
the development branch, delete it, and then push the changes to a
remote server.
Merge branch 'merge-branch'
Start story in Pivotal Tracker

Previously, when a story was started the Pivotal Tracker was not
updated to reflect that.  This change ensures that the story is
started on the tracker when it is started from the command line.
Merge branch 'start-story'