Removed ELPA from tracking.
Merge remote-tracking branch 'origin/master'

Conflicts:
	prsteele-general.el
	prsteele-markdown.el