adding some stuff
Merge branch 'develop'
forcing minified version of js assets
adding bourbon