Added working merge_with_master for bash
Merge branch 'master' of https://github.com/pboehm/dotfiles