Added SerialPortFactory with on('error')
Merge branch 'master' of github.com:JayBeavers/node-serialport into fix226
Update travis file
Merge pull request #233 from JayBeavers/fix226

Added SerialPortFactory with on('error')
Merge branch 'master' of github.com:voodootikigod/node-serialport into travis

Conflicts:
	.travis.yml
	serialport.js
	test/basic.js
Fix error event test to remove duplicate done calls