Merge pull request #5 from crimsonknave/master

Support for the rvm 0.5 plugin
Bump to 0.3.3
Added support for choice parameter
Merge remote-tracking branch 'upstream/master'