Merge pull request #2 from aammd/master

Get changes from upstream
Info re: get upstream changes into fork via GitHub
Merge pull request #9 from jennybc/master

Add info about keeping a fork synced