attempting to make pyflakes less painful
Merge branch 'master' of github.com:jerdmann/dotfiles

Conflicts:
	.emacs.d/init.el
fixed