working on nav

also starting to test skrollr
Merge branch 'master' of https://github.com/notenoughdata/harbor

Conflicts:
	app/assets/javascripts/application.js