Added facebook auth, removed google+ login on main login and a few cleanups on naming of files