Added memcached
updated read me usage section to include cd into directory
added instructions to amend devsites.pp manifest
changed web root to be in subfolder www
set PHP memory limit to 512M, max execution time to 360 and max input time to 120. all this to ensure that Open Atrium 2 runs more or less smoothly
fix merge issues