fix broken tests for travis
Merge branch '5.0-wip' of github.com:zurb/foundation into 5.0-wip