point to core branch
update core
fix failing spec
switch back to master for travis-core