[NO MERGE]

#192 + travis change so we test against the right core branch