pulled from master and updated txt file
updated rules migration column description to event
Merge pull request #98 from domestic/points_filter

Points filter
Unless needs a boolean to work.
Errors message for validations
Merge pull request #100 from domestic/UserViewFix

Errors message for validations
Merge pull request #99 from domestic/teams#edit

Unless needs a boolean to work.
updated rake task for csv point input
Merge branch 'master' into points_filter
updated txt file
made important changes
Merge pull request #101 from domestic/points_filter

Points filter
Minor bug fixes
Merge pull request #102 from domestic/UserViewFix

Minor bug fixes
sweet refactor
refactoring
further Refactor
All tests are passing.  Please spike this branch and make sure the tests pass before you put a pull request.
Added Launchy For Capybara Testing
Added more feature specs.