got csvs working and touched up file/image source handling
fixed forgot_pw bug and ticked up version
Merge remote-tracking branch 'wagn/master' into wagn_master