Organize activity model
Use personal rspec config instead of global
Clean up activities controller
Refactor tests
Merge pull request #122 from tuxedio/c-refactor-activity

Refactor activity