merge in mjolnir, tagbar, cocoa stuff