formulation beautification
Merge branch 'gh-pages' of https://github.com/idealcodes/clic-2014 into gh-pages

Conflicts:
	_abstracts/johan-nielsen.md