Fix diff output, now keeps 'added' in 'added' if replaced in later diffs
Merge branch 'master' into service_test

Conflicts:
	blank.log
openid

Merge branch 'openid' into oe
no blank log please
mergy

Merge branch 'emax' into oe
Updated Twitter Harvester to make it less aggressive with storage.
Merge branch 'master' into service_test

Conflicts:
	blank.log
 Merge branch 'service_test' of https://github.com/sociam/indx into service_test

Conflicts:
	blank.log
webjournal happiness
merging in service test

Merge branch 'service_test' into es
commented out annoying comment
fixed issue with orphaned data
Remove unused imports, add license header
merge in!

Merge branch 'service_test' of github.com:sociam/indx into es
merge intalled

Merge branch 'installed' of github.com:sociam/indx into es
performance on indxjs
simpliefied serialization to json (not ld)
critical bug patch
Async indxclient
Added template and files for instagram service