Only check controller, not action, for nav_link highlight
Remove unneeded parameters from nav_menu method
Merge branch 'master' of https://github.com/jacobsmith/scisci_rails
Fix source form JS not being initialized when creating a new source, fixes #29