Cleaned up active navigation logic and unnecessary assignment
Updated README, added some notes about deploying
Merge master into refactor to get Sam's newest JS changes