Various changes
Merge branch 'master' of https://github.com/PatrickNiedzielski/fb-hackathon-2013-11-21