Updated to fix UAT issues
Commented out testing

Will fix as per TODOs
Added missing period
Merge pull request #26 from stormpath/development

Changes based on code review