Start conversion to Bootstrap 3, correct typo in typedefs