Add custom presets folder option
Merge pull request #207 from njoyard/rewrite-streaming

Rewrite saveToFile / writeToStream
Changing option from presets to preset
Merge pull request #209 from njoyard/small-api-cleanup

Small api cleanup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/fluent-ffmpeg.js
	test/args.test.js
Fix documentation
Fix capabilities checking on windows, fixes #211
Fix jhsint errors, use strict mode and remove inputlive
Add URL, RTSP and RTMP tests
Test special characters in input/output files
Add node v0.11 to travis test matrix
Add missing test helper
Add more logging to failing tests
Remove mocha global timeout in favor of test-specific timeouts
Fix wrong process end handling
Test 'start' event and move it after ffmpeg is spawned
Merge pull request #215 from njoyard/jshint

Pass jshint, more tests and misc fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	lib/fluent-ffmpeg.js
Merge pull request #212 from njoyard/fix-211

Fix capabilities checking on windows, fixes #211
Small typo fix in README