Update bundle (to fix CVE-2013-6461 in nokogiri)
Also, middleman-favicon-maker config syntax has changed
Merge branch 'master' of github.com:lyonrb/website