current bashrc and iterm settings
Merge branch 'master' of github.com:mortik/dot-files

Conflicts:
	sublime/SchemrFavorites.sublime-settings