Merge branch 'add_git-wip'

Add the git-wip script for easy creation and merging of development
branches.

* add_git-wip:
  git-wip: Add -s option for git merge --squash
  git-wip: Create $use_new_branch + check for "$curr" = "HEAD"
  git-wip: Add -d option for fast-forward or recursive merge
  git-wip: Use "$ext" instead of "$curr.ext" if we're on master
  git-wip: Add -m option to merge the wip branch to parent
  Add git-wip, create WIP branches

5bde4488-447e-11e4-aaab-c80aa9e67bbd