Removing unncessary references from composer.json
Update composer.json
Datasource mods
Syntax error fix.
Merge remote-tracking branch 'upstream/2.1' into 2.1
Update composer.lock
Removing old methods
Some cleansup
gitignore mods
Adding some zf2 composer deps
Removing multiple templating engine support by default
Merge branch 'feature/composer-deps' into 2.1
Merge branch '2.1' into 2.1-cache

Conflicts:
	composer.json
	composer.lock