Don't need book_count method on bookshelf.
Merge branch 'master' into feature/no-such-book

Conflicts:
	features/support/test_driver.rb