updating some variable names
Merge branch '4.0-wip' of github.com:zurb/foundation into 4.0-wip