general cleaning
cleaned up urls.py
Merge branch 'master' into devon-milestone-4B
Can no longer name topics the same thing on client side
Merge branch 'master' into devon-milestone-4B
Continuing to fix controllers and controllersspec
Merge branch 'master' into devon-milestone-4B

Conflicts:
	rss_reader/main/static/js/controllers.js
Debugged merge with master
Merge pull request #73 from CombustibleLemons/devon-milestone-4B

Updated controllers and controllersspecs