well i'm an idiot
update FAQ
peace out haml
Merge branch 'master' into gh-pages