Fixed error output when rebasing fails
Fixed #3: 'git up' didn't return to current branch
Version bump to v0.2.2
Merge branch 'dev'