Add Atom and RSS link tags to head
small upgrade
Merge branch 'poplus'

Conflicts:
	poplus/basic/config.ini
Merge pull request #4 from jpmckinney/view2

Add Atom and RSS link tags to head
merge poplus