Added a step to create templates on the fly
Support template chaining for partials
Merge branch 'v3-stable' into feature/chained_templates_partials

Conflicts:
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
Make rubocop happy
Catch File read exceptions in frontmatter
attempt to get compass 1 working
Fixed rubocop offense
Rubocop fails faster than 'rake test'
Feature tests for force-option
Add force-option to init
Merge pull request #1369 from dg-ratiodata/feature/force_init

Add force option to "middleman init"
listen gem started using full paths instead of relative. Fixes #1374
bump
Parse asset-hashes on JSON files
Merge pull request #1381 from minusfive/asset-hash-json

Parse asset-hashes on JSON files
Test against Ruby 2.2.0 on Travis CI
Merge pull request #1389 from tricknotes/ruby-2.2

Test against Ruby 2.2.0 on Travis CI
Use HTTPS by default in new project Gemfiles. Closes #1372
Add 3.3.6 changes to Changelog
Merge pull request #1391 from natebird/patch-1

Add 3.3.6 changes to Changelog