Fixed some merge issues
Fixed some merge issues

deltatre-webplu/NEventStore,paritoshmmmec/NEventStore,jamiegaines/NEventStore,nerdamigo/NEventStore,gael-ltd/NEventStore,marcoaoteixeira/NEventStore,chris-evans/NEventStore,adamfur/NEventStore,NEventStore/NEventStore,AGiorgetti/NEventStore,D3-LucaPiombino/NEventStore