Added additional valid views to servertemplate show
Merge branch 'master' of https://github.com/patrickmcclory/RightScaleNetAPI

Conflicts:
	RightScale.netClient/Packages/RightScaleNetClient/RightScale.netClient.Powershell.dll
	RightScale.netClient/Packages/RightScaleNetClient/RightScale.netClient.dll