adding editor-extensions, geotags & sitemap modules to base build
Adding test for existing build.properties file
Adding zf2 as a platform
updating magento platform

updating magento platform to correctly build from composer and also
to perform cli installation
tidying up cleanup of setup files in project root
adding 3 clause BSD licence for Martin Glover
Merge branch 'magento'
adding zf2 to available platforms in README.md
Merge branch 'master' of https://github.com/martinglover/site-build

Conflicts:
	setup.sh
Merge branch 'master' of https://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
Merge pull request #7 from zucchi/mergefixes

Pull request to fix merge inconsistencies