update to Middleman 3.1.5
Merge branch 'master' of github.com:nathos/amicus

Conflicts:
	Gemfile