enqueue differently to fix colorbox failing to load
Merge branch 'master' into enqueue-fix
change version back
fix merge conflict
Merge pull request #343 from humanmade/enqueue-fix

Enqueue fix - dev