Schema stuff
added a few more tests?
about to add factory girl
Factory girl fixed stuff(create)
barely added capybara
merge with brian branch