Jedi for python
Merge branch 'master' of github.com:fakedrake/dotemacs
Merge branch 'master' of github.com:fakedrake/dotemacs

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Merge with home station.
Merge branch 'master' of github.com:fakedrake/dotemacs

Conflicts:
	cookbook.el
	fd-misc-programming.el
	fd-misc.el
	fd-octopress.el
	fd-term.el