Limiting top categories and interests
Merge branch 'master' of github.com:xpeppers/beancounter_rails

Conflicts:
	app/controllers/users_controller.rb