2.5: updates
2.5 branch updates
fixed error in metadata_per_document value
correct total
Merge pull request #90 from brianshumate/jbs-metadata-fix

Fix metadata_per_document value in total_metadata calculation
fix for 2.1 version of manual as well
2.5 updates and new Moxi guide with no version number in title
2.5 updates
2.5 added updated nanoc file. But first I got a fresh nanoc.yaml file and updated it.
Merge pull request #91 from brianshumate/jbs-metadata-fix

fix for 2.1 version of manual as well
Server 2.5: merge for publication
nanoc.yaml: update for server 2.5 menu
2.5 - changed moxi file name
2.5 multi-instance pic
Merge branch 'cb2.5' into stage
2.5 - fresh push to upstream stage
2.5 upstream to stage
moxi: remove 1.8 from first heading
nanoc.yaml file: replaced 2 missing links to elasticsearch and hadoop plugins