add gitrebase task
added readme docs for gitrebase
changing --theirs default to  in git rebase
Merge branch 'pr/14'
release 0.1.6
Merge branch 'master' into better-testing

Conflicts:
	tasks/git.js