Merge in latest marcuscom repo stuff