refactoring js unit tests, up to navcontroller stuff
Merge branch 'master' into devon-milestone-4B

Conflicts:
	rss_reader/main/static/js/controllers.js
Merge branch 'master' into devon-milestone-4B
added many more acceptance tests (though I need the page to work correctly to test out a few more)
more acceptance tests, fixed more from the setup
Search now allows for adding of feed urls directly
Merge pull request #61 from CombustibleLemons/devon-milestone-4B

Search Now Allows for URLs
resolved merge conflicts
some changes to make sure sorting works