updated annotate rake task
updated annotation
stripped out devise and warden (mostly)
reimplemented login/logout and password validation using Archie
fixed typo in nginx.conf
implemented setting password w/ salt
simpler pw comparison
fixed confirm pass method
Merge branch 'remove_devise'

Conflicts:
	app/views/models/user.rb
rename password_salt method
implemented basic OTP configuration
clean out some more devise stuff
fixed password validation
added OTP validation routines
updated otp var names
implemented OTP login
removed some more devise stuff
reimplemented reset password using archie
removed default from address
implemented actual pw reset