Checkin my fork of puppet-mode.el
updates
Merge branch 'master' of https://github.com/wfarr/dotfiles

Conflicts:
	bash_profile
	bashrc
	emacs.d/init.el