Edited instructions to reflect change in base quickstart. Also made assorted other fixes
Resolving merge conflicts with origin/master
Merge pull request #9 from hugofirth/changes-2014-2015

Documentation changes for 2014-2015