fixes formatting issues, no real changes
adds git ignore generator function to bashrc
Merge branch 'master' of ssh://github.com/scottopell/dotfiles

Conflicts:
	bashrc