downsize image
update conf
Merge branch 'source' of github.com:cfriedline/cfriedline.github.com into source

Conflicts:
	content/images/Caplinsetal2014_PrimerNote.png