Minor fixes
New command for merging.
Merge branch 'master' of https://github.com/akond/sh-git