Merge pull request #27 from jacindaz/foundation-stylin

Foundation stylin
various fixers
Merge branch 'master' into foundation-stylin
Merged with various_tweaks branch