updating bash profile
headless
merging

Merge branch 'master' of github.com:toddself/dotfiles

Conflicts:
	.gitignore