shorten cluster names
fix weapon rack
Merge branch 'master' into sinatra