Fix some merge problems.
Fix some merge problems.

Qinusty/rethinkdb,jesseditson/rethinkdb,urandu/rethinkdb,mquandalle/rethinkdb,rrampage/rethinkdb,robertjpayne/rethinkdb,spblightadv/rethinkdb,mcanthony/rethinkdb,niieani/rethinkdb,ajose01/rethinkdb,bpradipt/rethinkdb,eliangidoni/rethinkdb,wujf/rethinkdb,AntouanK/rethinkdb,lenstr/rethinkdb,jfriedly/rethinkdb,elkingtonmcb/rethinkdb,robertjpayne/rethinkdb,rrampage/rethinkdb,sebadiaz/rethinkdb,jesseditson/rethinkdb,rrampage/rethinkdb,grandquista/rethinkdb,spblightadv/rethinkdb,yaolinz/rethinkdb,rrampage/rethinkdb,sebadiaz/rethinkdb,pap/rethinkdb,mcanthony/rethinkdb,tempbottle/rethinkdb,lenstr/rethinkdb,grandquista/rethinkdb,Qinusty/rethinkdb,spblightadv/rethinkdb,4talesa/rethinkdb,matthaywardwebdesign/rethinkdb,nviennot/rethinkdb,mquandalle/rethinkdb,matthaywardwebdesign/rethinkdb,JackieXie168/rethinkdb,scripni/rethinkdb,marshall007/rethinkdb,dparnell/rethinkdb,ayumilong/rethinkdb,JackieXie168/rethinkdb,losywee/rethinkdb,RubenKelevra/rethinkdb,4talesa/rethinkdb,matthaywardwebdesign/rethinkdb,yaolinz/rethinkdb,jfriedly/rethinkdb,victorbriz/rethinkdb,gdi2290/rethinkdb,AntouanK/rethinkdb,pap/rethinkdb,jmptrader/rethinkdb,ayumilong/rethinkdb,elkingtonmcb/rethinkdb,Qinusty/rethinkdb,JackieXie168/rethinkdb,jmptrader/rethinkdb,niieani/rethinkdb,dparnell/rethinkdb,victorbriz/rethinkdb,elkingtonmcb/rethinkdb,wojons/rethinkdb,bpradipt/rethinkdb,victorbriz/rethinkdb,catroot/rethinkdb,AntouanK/rethinkdb,urandu/rethinkdb,tempbottle/rethinkdb,bpradipt/rethinkdb,gavioto/rethinkdb,sontek/rethinkdb,bchavez/rethinkdb,alash3al/rethinkdb,niieani/rethinkdb,yakovenkodenis/rethinkdb,nviennot/rethinkdb,matthaywardwebdesign/rethinkdb,sontek/rethinkdb,4talesa/rethinkdb,greyhwndz/rethinkdb,AtnNn/rethinkdb,AtnNn/rethinkdb,elkingtonmcb/rethinkdb,jfriedly/rethinkdb,gavioto/rethinkdb,mbroadst/rethinkdb,ajose01/rethinkdb,KSanthanam/rethinkdb,AntouanK/rethinkdb,wojons/rethinkdb,Wilbeibi/rethinkdb,mbroadst/rethinkdb,matthaywardwebdesign/rethinkdb,jfriedly/rethinkdb,JackieXie168/rethinkdb,AntouanK/rethinkdb,Wilbeibi/rethinkdb,urandu/rethinkdb,mbroadst/rethinkdb,alash3al/rethinkdb,alash3al/rethinkdb,eliangidoni/rethinkdb,pap/rethinkdb,mbroadst/rethinkdb,spblightadv/rethinkdb,sbusso/rethinkdb,lenstr/rethinkdb,gavioto/rethinkdb,RubenKelevra/rethinkdb,yaolinz/rethinkdb,victorbriz/rethinkdb,Wilbeibi/rethinkdb,RubenKelevra/rethinkdb,jfriedly/rethinkdb,grandquista/rethinkdb,mbroadst/rethinkdb,grandquista/rethinkdb,alash3al/rethinkdb,gdi2290/rethinkdb,catroot/rethinkdb,wojons/rethinkdb,KSanthanam/rethinkdb,sontek/rethinkdb,eliangidoni/rethinkdb,dparnell/rethinkdb,captainpete/rethinkdb,nviennot/rethinkdb,captainpete/rethinkdb,gdi2290/rethinkdb,AtnNn/rethinkdb,mquandalle/rethinkdb,victorbriz/rethinkdb,sebadiaz/rethinkdb,JackieXie168/rethinkdb,AtnNn/rethinkdb,ayumilong/rethinkdb,catroot/rethinkdb,losywee/rethinkdb,grandquista/rethinkdb,marshall007/rethinkdb,ajose01/rethinkdb,jmptrader/rethinkdb,AtnNn/rethinkdb,losywee/rethinkdb,jesseditson/rethinkdb,mbroadst/rethinkdb,urandu/rethinkdb,KSanthanam/rethinkdb,eliangidoni/rethinkdb,mbroadst/rethinkdb,nviennot/rethinkdb,Wilbeibi/rethinkdb,wojons/rethinkdb,bchavez/rethinkdb,greyhwndz/rethinkdb,yakovenkodenis/rethinkdb,Wilbeibi/rethinkdb,jesseditson/rethinkdb,jesseditson/rethinkdb,sbusso/rethinkdb,matthaywardwebdesign/rethinkdb,mcanthony/rethinkdb,jfriedly/rethinkdb,niieani/rethinkdb,captainpete/rethinkdb,eliangidoni/rethinkdb,pap/rethinkdb,grandquista/rethinkdb,marshall007/rethinkdb,catroot/rethinkdb,bpradipt/rethinkdb,rrampage/rethinkdb,Wilbeibi/rethinkdb,dparnell/rethinkdb,lenstr/rethinkdb,jmptrader/rethinkdb,wkennington/rethinkdb,sbusso/rethinkdb,sbusso/rethinkdb,sebadiaz/rethinkdb,mcanthony/rethinkdb,mquandalle/rethinkdb,tempbottle/rethinkdb,spblightadv/rethinkdb,yaolinz/rethinkdb,tempbottle/rethinkdb,nviennot/rethinkdb,eliangidoni/rethinkdb,nviennot/rethinkdb,catroot/rethinkdb,jmptrader/rethinkdb,wkennington/rethinkdb,sbusso/rethinkdb,Qinusty/rethinkdb,bchavez/rethinkdb,robertjpayne/rethinkdb,captainpete/rethinkdb,RubenKelevra/rethinkdb,pap/rethinkdb,yaolinz/rethinkdb,greyhwndz/rethinkdb,wkennington/rethinkdb,spblightadv/rethinkdb,wojons/rethinkdb,sebadiaz/rethinkdb,AtnNn/rethinkdb,jmptrader/rethinkdb,JackieXie168/rethinkdb,sontek/rethinkdb,Qinusty/rethinkdb,pap/rethinkdb,wojons/rethinkdb,niieani/rethinkdb,ayumilong/rethinkdb,tempbottle/rethinkdb,dparnell/rethinkdb,jfriedly/rethinkdb,AntouanK/rethinkdb,elkingtonmcb/rethinkdb,jesseditson/rethinkdb,tempbottle/rethinkdb,mcanthony/rethinkdb,robertjpayne/rethinkdb,jfriedly/rethinkdb,sbusso/rethinkdb,AtnNn/rethinkdb,losywee/rethinkdb,grandquista/rethinkdb,elkingtonmcb/rethinkdb,gdi2290/rethinkdb,matthaywardwebdesign/rethinkdb,wkennington/rethinkdb,wujf/rethinkdb,bchavez/rethinkdb,gdi2290/rethinkdb,wojons/rethinkdb,rrampage/rethinkdb,alash3al/rethinkdb,Wilbeibi/rethinkdb,RubenKelevra/rethinkdb,ajose01/rethinkdb,losywee/rethinkdb,mbroadst/rethinkdb,bpradipt/rethinkdb,scripni/rethinkdb,ayumilong/rethinkdb,captainpete/rethinkdb,dparnell/rethinkdb,bpradipt/rethinkdb,gavioto/rethinkdb,sontek/rethinkdb,sbusso/rethinkdb,mquandalle/rethinkdb,Qinusty/rethinkdb,KSanthanam/rethinkdb,bchavez/rethinkdb,mquandalle/rethinkdb,alash3al/rethinkdb,sebadiaz/rethinkdb,scripni/rethinkdb,greyhwndz/rethinkdb,gdi2290/rethinkdb,AtnNn/rethinkdb,victorbriz/rethinkdb,ajose01/rethinkdb,sontek/rethinkdb,robertjpayne/rethinkdb,marshall007/rethinkdb,wkennington/rethinkdb,Qinusty/rethinkdb,gavioto/rethinkdb,greyhwndz/rethinkdb,4talesa/rethinkdb,greyhwndz/rethinkdb,lenstr/rethinkdb,lenstr/rethinkdb,scripni/rethinkdb,ajose01/rethinkdb,AntouanK/rethinkdb,bchavez/rethinkdb,JackieXie168/rethinkdb,eliangidoni/rethinkdb,dparnell/rethinkdb,pap/rethinkdb,rrampage/rethinkdb,wujf/rethinkdb,eliangidoni/rethinkdb,RubenKelevra/rethinkdb,Qinusty/rethinkdb,captainpete/rethinkdb,marshall007/rethinkdb,elkingtonmcb/rethinkdb,jesseditson/rethinkdb,tempbottle/rethinkdb,4talesa/rethinkdb,victorbriz/rethinkdb,sontek/rethinkdb,scripni/rethinkdb,catroot/rethinkdb,ayumilong/rethinkdb,yaolinz/rethinkdb,gavioto/rethinkdb,mcanthony/rethinkdb,tempbottle/rethinkdb,dparnell/rethinkdb,yaolinz/rethinkdb,AntouanK/rethinkdb,greyhwndz/rethinkdb,Qinusty/rethinkdb,losywee/rethinkdb,urandu/rethinkdb,ayumilong/rethinkdb,captainpete/rethinkdb,wkennington/rethinkdb,KSanthanam/rethinkdb,JackieXie168/rethinkdb,bpradipt/rethinkdb,wujf/rethinkdb,grandquista/rethinkdb,losywee/rethinkdb,marshall007/rethinkdb,mquandalle/rethinkdb,yaolinz/rethinkdb,ajose01/rethinkdb,spblightadv/rethinkdb,Wilbeibi/rethinkdb,captainpete/rethinkdb,sbusso/rethinkdb,4talesa/rethinkdb,alash3al/rethinkdb,jmptrader/rethinkdb,mcanthony/rethinkdb,yakovenkodenis/rethinkdb,4talesa/rethinkdb,robertjpayne/rethinkdb,ajose01/rethinkdb,elkingtonmcb/rethinkdb,gavioto/rethinkdb,grandquista/rethinkdb,yakovenkodenis/rethinkdb,greyhwndz/rethinkdb,niieani/rethinkdb,mbroadst/rethinkdb,pap/rethinkdb,alash3al/rethinkdb,yakovenkodenis/rethinkdb,rrampage/rethinkdb,nviennot/rethinkdb,bchavez/rethinkdb,lenstr/rethinkdb,urandu/rethinkdb,yakovenkodenis/rethinkdb,robertjpayne/rethinkdb,niieani/rethinkdb,matthaywardwebdesign/rethinkdb,marshall007/rethinkdb,marshall007/rethinkdb,urandu/rethinkdb,robertjpayne/rethinkdb,RubenKelevra/rethinkdb,ayumilong/rethinkdb,spblightadv/rethinkdb,scripni/rethinkdb,mquandalle/rethinkdb,robertjpayne/rethinkdb,nviennot/rethinkdb,sebadiaz/rethinkdb,KSanthanam/rethinkdb,catroot/rethinkdb,victorbriz/rethinkdb,jesseditson/rethinkdb,wujf/rethinkdb,bchavez/rethinkdb,wkennington/rethinkdb,eliangidoni/rethinkdb,gdi2290/rethinkdb,dparnell/rethinkdb,scripni/rethinkdb,bchavez/rethinkdb,wkennington/rethinkdb,urandu/rethinkdb,wujf/rethinkdb,4talesa/rethinkdb,jmptrader/rethinkdb,bpradipt/rethinkdb,yakovenkodenis/rethinkdb,losywee/rethinkdb,niieani/rethinkdb,scripni/rethinkdb,sebadiaz/rethinkdb,yakovenkodenis/rethinkdb,RubenKelevra/rethinkdb,lenstr/rethinkdb,JackieXie168/rethinkdb,KSanthanam/rethinkdb,sontek/rethinkdb,KSanthanam/rethinkdb,wujf/rethinkdb,mcanthony/rethinkdb,gavioto/rethinkdb,wojons/rethinkdb,bpradipt/rethinkdb,catroot/rethinkdb