changed show items stuff
Merge branch 'master' into jeff_rails_upgrade_etc

Merging today's changes from master.