update gitignore
update bash profile
Merge branch 'master' of github.com:jch/dotfiles

Conflicts:
	bash/profile