Updated middleman
Merge branch 'master' of github.com:codio/site

Conflicts:
	Gemfile.lock