Minor refactoring and bugfixes, as well as fixed failing tests.
Updated and refactored sample data rake task.
Updated README.md.