fix shortcut conflict
fix randomly failing rake test
add ordering to models galleries
fix ordering defaults
fix generated gallery name