Merge pull request #117 from daniellemayne/2014.08

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