Update Master from staging - October 27th 2014

Hey @natmey - after you merge #285 , can you push to the live site? Thanks!