Update gitignore
Merge branch 'master' of github.com:socketstream/socketstream-0.4
Pass options through correctly