- handle startup error if elpy not installed
- update instructions for installing python dependencies
Merge branch 'master' of github.com:nhoffman/.emacs.d

Conflicts:
	init.el
	init.org