Updates to engineroom and metadata to work in knife solo
vagrant specific loading
Merge remote-tracking branch 'origin/tempBranch' into rails-thin-nginx-solr