Merge pull request #130 from AzureAD/master

merge master to dev
Merge pull request #131 from AzureAD/dev

merge dev to pkeyauth
cleanups
Merge pull request #132 from AzureAD/pkeyauth

cleanup for warnings
Merge pull request #133 from AzureAD/dev

Dev merge to master