adding editor-extensions, geotags & sitemap modules to base build
updating magento platform

updating magento platform to correctly build from composer and also
to perform cli installation

Conflicts:
	build/build.properties.tmp
corrected error with merge
Adding test for existing build.properties file
tidying up cleanup of setup files in project root
adding 3 clause BSD licence for Martin Glover
Adding zf2 as a platform

Conflicts:
	setup.sh
adding zf2 to available platforms in README.md
updated script to allow zf2 as a valid platform
Merge pull request #6 from zucchi/up/zf2

adding zf2 as platform
Merge pull request #5 from zucchi/up/misc

misc updates for build
Merge pull request #3 from zucchi/up/ss

adding editor-extensions, geotags & sitemap modules to base build
Merge branch 'master' of https://github.com/martinglover/site-build

Conflicts:
	build/build.properties.tmp
Merge branch 'zucchi-up/mg'
Merge branch 'master' of github.com:martinglover/site-build

Conflicts:
	build/build.properties.tmp
Merge branch 'master' of https://github.com/martinglover/site-build

Conflicts:
	build/build.properties.tmp