Merge branch 'work' of https://github.com/rclements/xrono

* 'work' of https://github.com/rclements/xrono:
  added daily target hours to users and user model
Merge branch 'master' of https://github.com/rclements/xrono

* 'master' of https://github.com/rclements/xrono: (310 commits)
  updated scenarios to make tests pass
  removed failing javascript line
  wrapped javascript in ready_function
  updated branch in deploy script to use master
  Updated tests for work unit emails
  Creating or editing work_units sends email, invoicing or submitting payroll does not
  Added tests for admin's ability to show/hide inactive clients in admin/users/projects
  Prevent clients from using developer's collab. checkbox
  Lets developer bill for projects he's not assigned to
  change Work_unit emails from after_save to after_create
  Fixed named_scope deprecation warnings
  Deleted a js function call to a non existing func
  Admin user roles: sort by active + show/hide inactive
  Fixed: Issue #5, calendar resets incorrectly
  Corrected database.yml.example & fixed cukes
  [TEST] Fix a few more things related to cukes.
  [TEST] Change some selectors around to support newer shipped web steps from cucumber.
  Upgraded to latest capybara, cucumber, cucumber-rails, rspec
  Upgrade database_cleaner gem to a version that supports the mysql2 gem.
  [DOC] move readme to markdown format, add travis badge.
  ...
Remove debugger
Merge pull request #21 from jpaulsingh/master

Need to remove debugger
fixed unentered time report
fixed an issue with the unentered time report
Add OAuth2 provider bits...super basic atm
Require admin access to modify doorkeeper applications
Make doorkeeper layout a good bit nicer
Merge branch 'master' of github.com:isotope11/xrono

* 'master' of github.com:isotope11/xrono: (560 commits)
  Make doorkeeper layout a good bit nicer
  Require admin access to modify doorkeeper applications
  Add OAuth2 provider bits...super basic atm
  fixed an issue with the unentered time report
  fixed unentered time report
  Remove debugger
  adamgamble wins! whats up now kiba?
  its neck and neck!
  he is gaining fast
  Run 7 day rather than 5 day workunit bar graphs
  Add dropdown subnav initial effort for admin-only...it's uglier than it should be atm
  fixed it for my newphew
  [AG] make it fail for my nephew
  adding in the missing js file and the script to fire the dropdown menu
  Fix kramdown rendering for data vault
  Add recent users for a given client to the clients index page.
  Update README to use new ci server
  lol that was wrong
  Add totals to weekly time report
  removed capybara webkit
  ...
Add oauth me.json credentials controller
Monkeypatch the fuck out of doorkeeper
Update doorkeeper monkeypatch
clients screen has total hours and uninvoiced hours
passing tests for previous commit
reverted to previous gemset
Update Gemfile to use the specific version of twitter bootstrap I know wasn't broken :)
Fix issues with delayed email processing

- Remove resque and add sidekiq
- Remove references to resque across project
- Add worker class for daily notification
- Add worker class for work unit notification
- Fix tests!
Failing Test Fixes
lock version of sidekiq