Merge pull request #81 from BuddyPlatform/develop

PR for 2.0.5 release
Fixups for 2.0.5
More fixups for 2.0.5
Merge pull request #82 from BuddyPlatform/master

Merge in 2.0.5 from master