add gem version badge (thanks Gemfury)
Merge branch 'master' of git://github.com/ryanb/cancan
adding passing test with non-nested conditions