Added test csv file to static files
Merge branch 'master' of github.com:spatialcollective/MicroFilters
Style update, added video and image clicker, but the twitter api is causing them to not work well (or quickly). Need to filter and resolve the urls ourselves instead.
Merge branch 'master' of github.com:spatialcollective/MicroFilters

Conflicts:
	core/templates/core/index.html
	core/utils.py
	core/views.py
Merge branch 'master' of github.com:spatialcollective/MicroFilters

Conflicts:
	core/utils.py
Style updates, image and video clicker changed to resolve urls instead of twitter api. Video clicker regex may not be working yet
Merge branch 'master' of github.com:spatialcollective/MicroFilters

Conflicts:
	core/utils.py