fixed some more user sessiong bugs
Merge pull request #17 from golden-bears-2014/Hex_url_surveys

fixed some more user sessiong bugs, added edit profile capabilities
resolved merge conflict. minor refactoring issue in controller