cmpweb-updates2-13

post launch updates
Merge branch 'gh-pages' of https://github.com/sdouglas/cmp into gh-pages

Conflicts:
	_posts/faculty/2013-05-18-kevan-shokat.md
	pages/cmp-administration/purchasing.md