Update bundle to fix CVE-2013-6461
Also, middleman_favicon_maker config syntax changed
Merge branch 'master' of github.com:alpinelab/website

Conflicts:
	Gemfile.lock