added autosetupmerge
Merge branch 'master' of github.com:zingales/bashrcs into linux