created checkins factory and tests, update to categories and assets tests
Merge branch 'development' into development_j
initial timeline commit
assets factory girl and testing done, all tests passing at this point
timeline now rendering from JSON on checkin index
Merge branch 'timeline' into development_j
solving conflicts with coffeescript