Modified api files to remove use of WTForms for users; Proper api logout method
Modified non-api user methods
get @jhladky's branch up