Manually adding things to the navbar.
Adds the placeholder's text on the homepage.
Rename to PyCon Canaada, to avoid confusion with California.
Merge branch 'pyconca2013' of git://github.com/pyconca/2013-web into pyconca2013