refactoring login and users
moving users into api
switched over api to use grape
Merge remote-tracking branch 'origin/master'