#25 updated gruntfile with new bundles
#25 fix jscs