delete unnecessary route
resolve merge conflict
modify route to remove unused route
fix broken test & error in nodescontroller
Merge pull request #15 from purple-martins-2013/tidy_up

Tidy up