Update readme
Update contributors
Merge branch 'master' of https://github.com/timwintle/mirror-api into refactor
Merge Tim's awesome work and fix some issues
Merge pull request #1 from Scarygami/master

Merging upstream changes