Updating website for 2014
Merge branch 'master' into gh-pages