Merge pull request #1 from scopatz/master

Update readme
Merge pull request #2 from scopatz/master

Update readme
Update readme
Update readme
yet another test.
fixed conflict