Merge branch 'master' of github.com:maxmeyer/middleman-presentation

Conflicts:
	Gemfile.lock
	middleman-presentation-core/lib/middleman-presentation-core/step_definitions.rb