Added unit testing with mocha and should
Merge remote-tracking branch 'phillip/master'

Conflicts:
	.gitignore
	heroin.js
	package.json
updated problem I caused when merging in package.json
Added test for factory
Merge remote-tracking branch 'phillip/master'

Conflicts:
	package.json
Fixed issues with Factory test
Added test withArgument
Merge remote-tracking branch 'zach/master'
updated readme.md
fixed edge case where comments or weird line breaks in parameter list could screw things up