Updated ready-execute to handle merge conflicts and run test suite if remote changes are pulled.
Added showterm video link in README.md for 'gs done' command.
(Some real ugly code duplication though for pull logic.)
Merge pull request #7 from buren/pull_state

Updated ready-execute to handle merge conflicts and run test suite if re...