fixed readme typo
Merge remote-tracking branch 'upstream/master'
STREAMS-145 | Created abstarct collectors/providers to instagram
STREAMS-143 | Refactored InstagramRecementMediaProvider and InstagramRecentMediaCollector to us new abstract classes.
STREAMS-145 | Created type converter for UserInfoData
STREAMS-145 | Updated comments
Added Published/DateTime to UserInfo Activity
STREAMS-144 | Added max batch size to AbstractInstagramProvider
STREAMS-144 | Perserved interupted state in data collector
STREAMS-152 | Added flag that allows us to force the use of whatever configuration attributes have been set
STREAMS-152 | Moved flag to more appropriate configuration file
STREAMS-152 | Code review feedback
STREAMS-152 | Removed possibility of NPE if forceUseConfig flag is not set
Merge PR#31 from 'jletourneau80/master'
Merge PR#69 from 'rbnks/STREAMS-144'
Merge PR#71 from 'robdouglas/STREAMS-152'
Merge branch 'master' of https://github.com/apache/incubator-streams into STREAMS-157

Conflicts:
	streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java