Fixing merge conflicts
Fixing merge conflicts

gkassabli/chisel,zats/chisel,programming086/chisel,dopcn/chisel,dopcn/chisel,dopcn/chisel,facebook/chisel,facebook/chisel,facebook/chisel,jbinney/chisel,iOSDevBlog/chisel