Updating with vagrant and the secret token
Merge branch 'master' of https://github.com/davehubler/hydra

Conflicts:
	Vagrantfile
	puppet/manifests/default.pp
	puppet/modules/memcached/.gitignore
	puppet/modules/memcached/Modulefile
	puppet/modules/memcached/README.md
	puppet/modules/memcached/manifests/init.pp
	puppet/modules/memcached/manifests/params.pp
	puppet/modules/memcached/templates/memcached.conf.erb
	puppet/modules/memcached/templates/memcached_sysconfig.erb
	puppet/modules/mysql/.fixtures.yml
	puppet/modules/mysql/.gemfile
	puppet/modules/mysql/LICENSE
	puppet/modules/mysql/Modulefile
	puppet/modules/mysql/README.md
	puppet/modules/mysql/files/mysqltuner.pl
	puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb
	puppet/modules/mysql/lib/puppet/provider/database/mysql.rb
	puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb
	puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb
	puppet/modules/mysql/lib/puppet/type/database.rb
	puppet/modules/mysql/lib/puppet/type/database_grant.rb
	puppet/modules/mysql/lib/puppet/type/database_user.rb
	puppet/modules/mysql/manifests/backup.pp
	puppet/modules/mysql/manifests/config.pp
	puppet/modules/mysql/manifests/db.pp
	puppet/modules/mysql/manifests/init.pp
	puppet/modules/mysql/manifests/java.pp
	puppet/modules/mysql/manifests/params.pp
	puppet/modules/mysql/manifests/python.pp
	puppet/modules/mysql/manifests/ruby.pp
	puppet/modules/mysql/manifests/server.pp
	puppet/modules/mysql/manifests/server/account_security.pp
	puppet/modules/mysql/manifests/server/monitor.pp
	puppet/modules/mysql/manifests/server/mysqltuner.pp
	puppet/modules/mysql/templates/my.cnf.erb
	puppet/modules/mysql/templates/my.cnf.pass.erb
	puppet/modules/mysql/templates/mysqlbackup.sh.erb
	puppet/modules/postgresql/GPL-3
	puppet/modules/postgresql/Modulefile
	puppet/modules/postgresql/README.md

puppet/modules/postgresql/lib/puppet/provider/pg_database/debian_postgre
sql.rb
	puppet/modules/postgresql/lib/puppet/provider/pg_database/default.rb

puppet/modules/postgresql/lib/puppet/provider/pg_user/debian_postgresql.
rb
	puppet/modules/postgresql/lib/puppet/provider/pg_user/default.rb
	puppet/modules/postgresql/lib/puppet/type/pg_database.rb
	puppet/modules/postgresql/lib/puppet/type/pg_user.rb
	puppet/modules/postgresql/manifests/db.pp
	puppet/modules/postgresql/manifests/init.pp
	puppet/modules/postgresql/manifests/params.pp
	puppet/modules/postgresql/manifests/server.pp
	puppet/modules/postgresql/templates/pg_hba.conf.erb
	puppet/modules/postgresql/templates/postgresql.conf.erb