Removed backup file
Merge pull request #1 from newscoop/master

Merge back changes from official repo
Merge pull request #14 from danielhjames/master

Removed backup file