remove the word "keypair" from resource labels and test warnings
Merge remote-tracking branch 'upstream/2014.08' into 2014.08
added checks for detach and create volume tests
Merge pull request #117 from daniellemayne/2014.08

2014.08: 	added checks for detach and create volume tests + removed "keypair" copy/paste error