Merge pull request #2 from cindywise/master

miscellaneous corrections and pulling out PGEU info
Merge pull request #3 from cindywise/master

Making conf name consistent in all pages
Many updates...
Fix the CFP deadlines.
Update callforpapers.html

Removed the text about 90 minute sessions, no way no how
fix some typos, clear up some of the sentence structure
Merge pull request #4 from kpennella/patch-1

Update callforpapers.html
Merge branch 'master' of https://github.com/gorthx/pgopen2014 into gorthx-master

Conflicts:
	template/pages/2014/callforpapers.html
Change heading
Fix twitter
Minor corrections
just use https
just use https
update the wording on the CfP page
Fix sync of media
Merge branch 'master' of https://github.com/gorthx/pgopen2014 into gorthx-master

Conflicts:
	template/pages/2014/callforpapers.html
Merge branch 'gorthx-master'
More revisions
redo my changes to the CfP page.

I'm sorry, I've been using svn.
Fix call for papers