Updating the README
Merge branch 'develop'
Merge branch 'develop'
Updated the version number on the login page
Path issue when script run multiple times
Merge pull request #33 from lrasmus/master

Fix for install script when re-installing
fix positioning of Aggregate Count value tags 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
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
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