added devise.. that was a mistake
failure of a revert
merge fix
removed devise
removed devise with migration
merge fix - am beggining to regret ever putting devise in..
got everything back into master
merge fix on the schema
added json templates for the entries
updated the tests to test json responses for the entry controller