Fixed issue where @mixin button-size was creating invalid css 'padding-top: false;' and 'padding-bottom: false;'
Removed invalid bottom:none declarations from _joyride.scss. Tested against http://foundation.zurb.com/docs/components/joyride.html
fixed conflicts