Merge branch 'master' into gh-pages

* master:
  tuned up file naming for syllabi

Conflicts:
	GEOG485-585_syllabus.pdf
	deep-dives/deep-dives.pdf
	goalsAndObjectives/goalsAndObjectives.pdf
	lectures/geog485_sp2014_01.pdf
	milestones/milestones.pdf
Merge branch 'gh-pages' of https://github.com/karlbenedict/GEOG485-585 into gh-pages

* 'gh-pages' of https://github.com/karlbenedict/GEOG485-585: