Fix resumption token bug, other bugs, coding standards.
Changes based on codereview feedback.
Merge pull request #16 from jordandukart/7.x-fix-resumption

Fix resumption token bug, other bugs, coding standards.