terminal changes
Merge branch 'master' of http://github.com/rafaelh/dot_win

Conflicts:
	bashrc
fixed bashrc