added update ability to meet the band and messed with some ideas about test server mysql
updated phpunit tests and started working with environment variables
A little more work on environment variables
Merge branch 'rawilder' into new_features
more changes to the environment variables issue
Merge branch 'integration' of https://github.com/agilemusicproject/agilemusicproject.com into integration

Conflicts:
	web/index.php
finally got environment variables working in apache using local test server
updated readme with environment variable requirements
Merge branch 'rawilder' into integration

Conflicts:
	web/index.php
fixed phpcs errors
Merge branch 'integration' into local_chris
added dbscript for test database
removed swiftrmail
changed dbscript2 to make amp database instead of amp_test for CI
Merge branch 'integration' into local_chris