added poplus template
Initial commit
Merge remote-tracking branch 'origin/master'
added ignores for poplus template
updates .gitignore
add visualization and new feeds
Update config.ini
small upgrade
Merge branch 'poplus' of https://github.com/ciudadanointeligente/planet into poplus
add sunlight foundation feeds
add icon for poplus
upgrade
Fix Poplus feed location
Merge pull request #1 from jpmckinney/feed

Fix Poplus feed location
Add Atom and RSS link tags to head
Add an email subscription form
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 pull request