added tmux and indention fixes

Conflicts:
	.bashrc
few fixes from macosx

Conflicts:
	.bashrc