Updated per "ODCRM Website Spin-up Steps" document
Merge branch 'master' of https://github.com/SpryDigital/NimbleDrupalInstallProfile

Conflicts:
	base_drupal.make
	nimble.info