Merging changes from last night.
Merge branch 'master' of https://github.com/DataJunkie/dissertation

Conflicts:
	fetch_feeds.py