Updates to navigation
Merge branch 'master' of https://github.com/sourceclear/twitter.github.com

Signed-off-by: Mark Curphey <mark@sourceclear.com>

Conflicts:
	_deploy
	public/404.html
	public/atom.xml
	public/blog/2013/04/07/healthcare-for-software/index.html
	public/blog/2013/07/10/introducing-headlines-library/index.html
	public/blog/2013/07/10/introducing-the-headlines-project/index.html
	public/blog/2013/07/10/jason-nichols/index.html
	public/blog/2013/07/10/paul-ambrosini/index.html
	public/blog/2013/07/10/tim-smith/index.html
	public/blog/archives/index.html
	public/blog/categories/headlines/atom.xml
	public/blog/categories/headlines/index.html
	public/blog/categories/java/atom.xml
	public/blog/categories/java/index.html
	public/blog/categories/labs/atom.xml
	public/blog/categories/labs/index.html
	public/blog/categories/newhires/atom.xml
	public/blog/categories/newhires/index.html
	public/blog/categories/open-source/atom.xml
	public/blog/categories/open-source/index.html
	public/blog/categories/sourceclear/atom.xml
	public/blog/categories/sourceclear/index.html
	public/blog/categories/sourecleared/atom.xml
	public/blog/categories/sourecleared/index.html
	public/index.html
	source/_includes/custom/header.html