Fixed flash messages
Merge branch 'master' of https://github.com/shoptology/boilerplate
Fixes to make styleguide update more seamlessly