Comment testing changes
merge conflicts
Fixing tests
Merge pull request #25 from Cynaria/bill_tests_fix

bill tests fixed after renaming joins
further built out User views and controllers
merge conflicts are fun
fixed merge conflicts
Pushing fixed conflicts
fixed small migration problem
Merge pull request #26 from Cynaria/commentable_tests

Commentable tests
fixing more merge conflicts
Merge pull request #27 from Cynaria/controllers_views_sprint_2

Controllers views sprint 2
test fixes--fixing merge errors
commented out user_controller_spec to pass tests