Merge pull request #9 from jennybc/master

Add info about keeping a fork synced
Merge pull request #3 from aammd/master

Sync with master