Merge pull request #55 from joshmoore/rebase-restart

Add --continue option to rebase
Add Deploy command to replace the doc_init.sh and doc_deploy.sh scripts

Merge scripts into a single command. Folders can be initialized by passing the
--init optional argument.
Add unit tests for the new Deploy command
Add TestDeploy to the list of tests for the Travis build
Remove doc_init and doc_deploy scripts
Fix unit test extension
merge master -D org -I include -E conflict -E needs-fixes -E broken: PR 10 (Convert bash scripts to Python)
merge master -D org -I include -E conflict -E needs-fixes -E broken: PR 47 (Auto submod updating)
merge master -D org -I include -E conflict -E needs-fixes -E broken: PR 52 (Filter improvement)
merge master -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/snoopycrimecop
Already up-to-date.
Merged PRs:
  # PR 10 sbesson 'Convert bash scripts to Python'
  # PR 47 joshmoore 'Auto submod updating'
  # PR 52 sbesson 'Filter improvement'

Generated by SCC-merge#128 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/128/)