dont forget to package up solr.xml, added in #186
Merge pull request #224 from tumblr/gabe-fix-solr

dont forget to package up solr.xml, added in #186
Merge remote-tracking branch 'origin/master' into gabe-strappiest-boots