fix positioning of Aggregate Count value tags in QRDA Cat 3 file
remove import of non-existent button.css
Updated Procfile to start proper processes
Updated README.md to remove mention of redis and resque and provide instructions on running in development mode
Merge remote-tracking branch 'mb/remove-button-css' into develop
Switching over to SimpleCov
use Cypress-compatible time formats in QRDA Cat 3 file
Merge remote-tracking branch 'mb/aggregate_value_fix' into develop
updated travis setup
Merge remote-tracking branch 'ph/develop' into develop
Updated .travis.yml for Ruby 2.0. Test suite executes succesfully under this new version.
Implementing removal of providers. Fixes #36
tabs to spaces conversion, extraneous whitespace removed
Merge remote-tracking branch 'as/develop' into develop

Conflicts:
	.travis.yml
Locking down dependencies to merge to master
Merge branch 'develop'

Conflicts:
	README.md
change reporting period in UI to 1 year. closes #1
Merge pull request #48 from yoon/master

change reporting period in UI to 1 year.
making idle timeout work with devise
wait until logout_url has completed before redirect_url