get rid of shoulda context
fix some display issues
add memberships
replace cancan with six
add proper selector to tests with unpublished albums
allow artist users to edit resources
show manage users button to admin
allow admin to manage memberships
add rvm files to .gitignore
Merge branch 'artists-users'
upgrade to rails 3.2.16