Add a test for compiler/route ordering
Merge branch 'master' into dev-metadata-route

Conflicts:
	tests/Hakyll/Core/Rules/Tests.hs