YAML loading in to start and search views
Merge branch 'master' of https://github.com/jneighbs/newsfeed

Conflicts:
	nf_server/models.py
	nf_server/templates/right-bar.html
	nf_server/utils.py
	nf_server/views.py