Merge remote-tracking branch 'origin/master'
Add VM and cloud deployment
IDMAUTH-198
IDMAUTH-198 updates to war file
Merge remote-tracking branch 'origin/master'

Conflicts:
	parent/pom.xml
IDMAUTH-198 Updates to inclide Postgres database form RDS. Refactored tomcat_iam module name.
IDMAUTH-198 Update to mod_auth_cas to exclude hadcoded castest and iam_admin location and proxy pass.
IDMAUTH-198 Update to mod_auth_cas to exclude hadcoded castest and iam_admin location and proxy pass.
Merge remote-tracking branch 'origin/master'

Conflicts:
	deploy/resources/manifests/init.pp
	deploy/resources/modules/mod_auth_cas/templates/mod/auth_cas.conf.erb
IDMAUTH-198 Updated evenup dependencies as the tags are gone. Updated the tomcat version, as the one we used does not exist in the repository anymore.
IDMAUTH-198 Updated evenup dependencies as the tags are gone. Updated the tomcat version, as the one we used does not exist in the repository anymore.
IDMAUTH-198 - Split git repository into modules
IDMAUTH-198 - Split git repository into modules
Merge branch 'master' of repository.iam.huit.harvard.edu:/opt/git/puppet/iam_tomcat
Delete Vagrantfile
Merge branch 'master' of https://github.com/vkojuharova/iam_tomcat
Merge branch 'master' of http://github.com/vkojuharova/iam_tomcat

Conflicts:
	manifests/config.pp
	manifests/deploy/file.pp
	manifests/deploy/war.pp
	manifests/init.pp
	templates/server.xml.header.erb