Move JS to bottom
Merge branch 'stub-styles'
updated gulpfile with js support
Merge branch 'master' into stub-styles