Updates
Merge branch 'master' of github.com:brianmed/InfoServant-Feeds

Conflicts:
	etc/httpd/conf/conf.d/infoservant.com.conf