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

Conflicts:
	files/bashrc
	install
added bash-strap as a reference
Merge branch 'linux' of github.com:zingales/bashrcs
fixed mac linux divergence