A stricter rubocop configuration
Updated gemlock
Now it is possible to change the size of the presentation
Merge branch 'master' of github.com:maxmeyer/middleman-presentation into feature/plugin_support

Conflicts:
	Gemfile.lock
	config/rubocop/exclude.yml