Merge remote-tracking branch 'zurb/develop' into fix/fix-es6-plugins-webpack-build-2

diff --cc gulp/config.js
Simple merge

diff --cc js/foundation.accordion.js
Simple merge

diff --cc js/foundation.dropdownMenu.js
Simple merge

diff --cc js/foundation.magellan.js
Simple merge

diff --cc js/foundation.offcanvas.js
Simple merge

diff --cc js/foundation.reveal.js
Simple merge

diff --cc js/foundation.smoothScroll.js
Simple merge

diff --cc js/foundation.tabs.js
Simple merge