Finish off nav; broken highvoltage

For some reason, the highvoltage plugin is now not working
Merge branch 'master' of https://github.com/chaserkid/shadowfalls

Conflicts:
	config/navigation.rb