合并官方更新#1

Merged

pluwen merged 9 commits intopluwen:masterfrom

fitztrev:master

Jul 25, 2016

Commits on Mar 1, 2016

Merge remote-tracking branch 'fitztrev/master'
Matt Turner
committed

Commits on Jun 10, 2016

Updated the Contributors List.
Matt Turner
authored

Commits on Jun 14, 2016

Merge pull request #178 from pluwen/master
Matt Turner
authored
Updated the Contributors List.
Matt Turner
authored

Commits on Jul 24, 2016

Merge remote-tracking branch 'upstream/master'
Matt Turner
committed
Fixes for release 1.2.7
Matt Turner
committed
Merge pull request #183 from thshdw/Fixes-for-1.2.7
Matt Turner
authored
Update README.md
Matt Turner
authored
Update README.md
Matt Turner
authored