Updated gitignore
added application.conf to .gitignore
First cut at adding scala
Merge branch 'master' of github.com:hltcoe/concrete into scala
Modified code to print a list of ids in a text file
Merge branch 'master' of https://github.com/hltcoe/concrete
readme update for latest version
Removed some legacy code
readme update
Delete some legacy code
Merge branch 'master' of github.com:hltcoe/concrete into scala
Updated queryclient and sbt
removed pom.xml section
kill riak dependency in java pom.xml
Merge pull request #3 from hltcoe/scala

Scala ingest code
Merge branch 'master' of https://github.com/hltcoe/concrete

Conflicts:
	.gitignore
Added TemporalFact subtypes to Situation definition.

Temporal facts are relations between two entities or situations, such as
before, after, etc.  These are enumerated as TemporalFactType.
Removed Relation set and added in labeled string attribute and edge label attribute
Merge branch 'master' of https://github.com/dkolas/concrete
Merge pull request #4 from dkolas/master

Additions to protobuf spec for Temporal Facts