updated build dist bash script to properly add styles

modified jshint to ignore certain syntax issues
fixed merge conflict