got rid of devise confirmable for now
pulling down develop
updated tests
pulling develop
fixed some errors