Updating layouts dependency

Updating layouts dependency, updating tests, and adding a lazy loading layout wrapper (this will probably be removed)
Merge branch 'v0.6.0' of https://github.com/assemble/assemble into v0.6.0

Conflicts:
	lib/assemble.js
	test/assemble.engine.js
Rolling back lazy layouts

This should be done in the layouts library