update the wording on the CfP page
Merge branch 'master' of https://github.com/gorthx/pgopen2014 into gorthx-master

Conflicts:
	template/pages/2014/callforpapers.html
Merge branch 'gorthx-master'