Merge pull request #275 from PonteIneptique/new_guides

New org. layout and other changes.
Prior to cleaning up search params, hack in method of providing arbitrary extra query params to Solr
Merge branch 'master' into merge_guides
Merge remote-tracking branch 'upstream/merge_guides' into new_guides