Fixed issue with rebase on OSX
Added alias for work project
Git relate now includes merges by default
Simplified stanup
Fine tuned maven opts
Added fake/local ci scripts
Added git pull-request alias for stash