re #33 - Moved navigation from config to JSON
Merge branch 'feature/33-nyamu' of https://github.com/nooku/www.nooku.org into feature/33-nyamu

Conflicts:
	_config.yml
	_includes/footer.html