changing netappiscsi to [netapp][iscsi] to support multiple netapp drivers. adding [netapp][nfsdirect]
Moving cinder.conf to provider
subscribing to provider, changing template for storage_options partial
Doc updates
Merge branch 'grizzly' of git://github.com/rcbops-cookbooks/cinder into grizzly
Merge branch 'grizzly' of https://github.com/willkelly/cinder into netapp
fixing typo
closing case statement
adding platform_options back in
fixing developer error in typing
Merge pull request #43 from jcannava/netapp

Merged automatically by jenkins after successful build test