Merge pull request #16 from eminence/merge_prs

Merge the 2 other open pull requests
Fix unclosed <div>

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Added 3 new FAQ entries