commit
Updating
commit
test
commit
Merge branch 'master' of https://github.com/RightScale-IT/RightScaleNetAPI

Conflicts:
	RightScale.netClient/Packages/RightScaleNetClient/RightScale.netClient.Powershell.dll
	RightScale.netClient/RightScale.netClient.Powershell/SSHKeys.cs
Merge branch 'master' of https://github.com/rs-services/RightScaleNetAPI