Added logout functionality
Haul password change code over into UsersController
Begin working on lock timeout
Merge branch 'develop' into develop-nigel-users

Conflicts:
	config/routes.rb
Added JS countdown with 5 seconds instead of 600 of idle time
Countdown is ready to roll, still low times though
Lockout timer and associated specs are now fully functional!
Forgot password functionality is in
Ricky changed his mind on email again
Merge branch 'develop-nigel-users' into develop

Conflicts:
	config/routes.rb
	db/schema.rb
Shouldn't schema.rb not be in the repository?
Merge branch 'develop-nigel' into develop