Updated FAQ
Added emcee to salt
Merge branch 'master' of https://github.com/andrewclegg/snake-charmer
Undid accidental commit to master