back to bashrc
Merge branch 'master' of github.com:saxix/dotfiles

* 'master' of github.com:saxix/dotfiles:
  osx/Linux compat
  update to work on OSX

Conflicts:
	.bash/.bashrc
	Makefile
updates Makefile