mv thrift generated things to ciir.proteus.thrift
main in homer; add slf4j as a dependency

-- why doesn't maven pull this in automagically?
Indexing books & pages
Remove PseudoDocument from Entity Corpus flow
Clean up DocumentAggregator
Fix corpus folder issue
People, Misc, Locations
Finish building most of Proteus demo with 3.5 tools
Lingering changes
Add a main class
Merge branch 'jfoley-dev'

Conflicts:
	homer/pom.xml
	homer/src/main/java/ciir/proteus/build/Main.java
	homer/src/main/java/ciir/proteus/index/PseudoCorpusReader.java
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Collection.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Location.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Miscellaneous.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Page.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Person.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Picture.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Topic.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.WikipediaEntity.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/README
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/RichSearchResult.show.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/SearchResult.show.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/ProteusObject.Collection.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/ProteusObject.Location.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/ProteusObject.Miscellaneous.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/ProteusObject.Page.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/ProteusObject.Person.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/ProteusObject.Picture.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/ProteusObject.Topic.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/ProteusObject.WikipediaEntity.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/README
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/RichSearchResult.show.scaml
	morpheus/src/main/webapp/WEB-INF/ciir/proteus/thrift/SearchResult.show.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Collection.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Location.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Miscellaneous.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Page.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Person.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Picture.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.Topic.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/ProteusObject.WikipediaEntity.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/README
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/RichSearchResult.show.scaml
	old-demo/morpheus/src/main/webapp/WEB-INF/ciir/proteus/SearchResult.show.scaml
Fix tests!