Merge pull request #6 from kookster/master

Use correct decorator for index, not just show, make tests load factories
trying to get coveralls to register changes