edit passport to allow for email and username with checking:
fix conflicts in passport js
reconfigure passport to work with email field
fix conflicts