Combined the js assets with the theme assets 

(as requested per @pjackson28)