- 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
add shell environment setup script
tear out publication to gh-pages from SConstruct
check emacs version
a bit of cleanup
add ghp-import
remove org-export and gh-pages submodule
- add script to create a virtualenv
- add org-export as submodule
- update setup instructions
- update SConstruct to tangle, compile html, publish
update setup instructions
more text, clean up a bit
update venv.sh to check versions more carefully, make src if necessary
update org-export and provide instructions for using git submodule
function for using default venv
add jedi to requirements
add function to activate current virtualenv
don't attempy to launch emacs in the default venv
Merge branch 'master' of github.com:nhoffman/.emacs.d
add function to install elpy requirements to a virtualenv
update elpy configuration for v1.5.0