formatting
switched back to gulp print. blacklisted, maybe, but its what i wanted
fixed the build process. oops!
used jscs default path
removed merge-stream, cleaned up analyze
added linefeed at end of each file
line feed at end of server files
jscs: converted tabs to spaces
bad comma
max length of line now set to 100
fixing discs rules. not sure how these got out of whack
updated all js files to include them all. wasn't getting gulp file nor karma before
Merge branch 'develop'

Conflicts:
	gulpfile.js