more work
Merge branch 'rework' of github.com:fshowalter/movielog into rework

Conflicts:
	config.rb
	config.yml
spec pass