Migrating more to backbone
Resolving conflicts and importing recent changes from upstream
Disabling dummy data
Merge pull request #7 from wvoelcker/master

Making dummy data more complete