Move the tests/ directory out of the root.
Move the Drupal root back to the doc root.
Preparing to include all Drupal code instead of just the drush make file.
Adding contrib modules and third party libraries.
Include Drupal core.
Merge branch 'master' into pantheon
Move new files into place.
Merge branch 'master' into cms

I manually resolved conflicts with
	drupal/nesi.drush.make
	sites/default/modules/nesi_areas_of_research/ (directory)
	sites/default/themes/nesi_bootstrap/templates/block--block--15.tpl.php