Changes for Shopify dev.
Merge branch 'master' of github.com:angelini/dotfiles