EM added back in flex slider
Merge branch 'master' of github.com:jericmason/core-theme