Working on bullet 3 of #53
Merge pull request #56 from wesbos/master

Improved Flow
Support for inital changeset on application init
Added merge conflicts confirmation box
Interface for pulling latest