Merge branch 'master' into catalogImages

Conflicts:
	content/markdown/news/2014-12-20-welcome-to-the-brand-new-tnris.md
closes #74 and closes #77, added images and alt tags, no more missing data catalog images, filled maps and data page
parse markdown from csv files as file contents, not in swig filter
this keeps processing uniform and allows things like macro links to work
better
fix HPIDS links from data catalog entries; closes #79
Merge remote-tracking branch 'origin/catalogImages'

Conflicts:
	content/markdown/spotlights/2014-10-25-upper-devils-river-watershed.md
fix broken wms link for NAIP_2010; closes #75