Reset password changes
Modified config envir; no changes to p_r_controller
Merge pull request #14 from mattdvhope/mod4

Pull request to merge mod4 with master.