Updated .travis.yml for Ruby 2.0. Test suite executes succesfully under this new version.
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
modified qrda cat3 export to use health data standards exporter
added initializer to pull version info from git, added version info to login page, added ruby git to gemfile
Merge branch 'develop' of https://github.com/ahubley/popHealth into develop
modified public/403.html to make an HTTP delete request for users/sign_out, modified production environment config to support this change, and added a check if attempting to log a logout with nil user
Updating the Gemfile.lock based on changes in the Gemfile
add link to export QRDA Cat. 3 doc
Merge pull request #49 from carpeliam/develop

add link to export QRDA Cat. 3 doc
Merge pull request #48 from yoon/master

change reporting period in UI to 1 year.
Merge branch 'master' of https://github.com/pophealth/popHealth into develop
replaced idle time out jquery plugin and fixed functionality, updated config yaml accordingly
show bundle version
easier bundle import, copied from project cypress
Merge pull request #50 from ahubley/develop

Develop
Merge remote-tracking branch 'yoon/show_bundle_version' into develop

Conflicts:
	app/views/devise/shared/_links.erb