getting there. removed active admin, some tests passing.
fixed sign out problem
fine tuned the login/logout functionality
massaging some of the tests
we're almost there
cleaning up collections
blargy collections hell
collections working
cleaning up
Merge branch 'collection'

Conflicts:
	app/views/layouts/application.html.erb
	db/schema.rb
Fix derp bug