Refactored TermMention and TermRelationship from inner classes of TermExtractionResult to outer classes.  Made TermMention immutable, save for process, and added a Builder to clarify constructor arguments.  Refactored model.termMention.TermMention to TermMentionModel to avoid class name conflicts.  Added TermWorker and TermResolutionWorker interfaces and updated TermExtractionBolt to look for and execute TermResolutionWorkers serially after all TermExtractionWorkers have executed and their results have been merged.  Added ClavinLocationResolutionWorker and supporting classes and service definition.
fix mainclass of storm uber-jar
Merge branch 'master' into clavin

Conflicts:
	lumify-twitter/src/main/java/com/altamiracorp/lumify/twitter/DefaultLumifyTwitterProcessor.java
tweet highlighting fix
Fixed PMD and FindBugs errors in Twitter project.  Added description to POM file.  Removed test classes from checkstyle report.
Merge branch 'master' of ssh://github.com/altamiracorp/lumify-all
Moved “Twitter Profile Image” to be a subclass of Entity instead of Tweet.
change reflection based BootstrapBindingProvider to use META-INF services for speed and to fix demo.lumify.io
lumify twitter processor
twitter stuff
default lumify twitter processor
more twitter stuff
refactored ontology to return correct relationships
[64199020]: Modified warning messages generated by profile photo retrieval so they don’t print stack traces for bad URLs (MalformedURLException) or HTTP error codes (IOException) on read.
merge from master
Update relationship names to be unique
merge from master
Abstracted Facebook and twitter specific ontology stuff from enterprise
remove Artifact table and store the data in secure graph
change secure-graph api