Fix content_tag helper, only try to mark content as safe if it is not a hash of options
Merge pull request #941 from krautcomputing/fix_content_tag_helper

Fix content_tag helper, only try to mark content as safe if it is not a hash of options
tests for content_tag escaping
bump listen
implement redirect support
Update gitignore
Merge pull request #943 from southpolesteve/patch-1

Add .DS_Store to generated .gitignore
dont hardcode ignored build dir name
fix layouts with implied extensions
Fix regex which was allowing i18n to file yaml files in the data folder
prep
ignore all ds_store
Fixed typo in middleman-core/core-extensions/request.rb.
Merge pull request #945 from al/bugfix-typo_in_core_extensions_request

Fixed typo in middleman-core/core-extensions/request.rb.
Add .nojekyll file to indexable-app fixture
Add expectation that .nojekyll file should exist to directory_index feature
Update Sitemap source_dotfiles to support .nojekyll file
Merge pull request #947 from arronmabrey/add_support_for_nojekyll_dotfile

Add support for nojekyll dotfile [with tests]
prep
Merge branch 'master' of github.com:middleman/middleman