Added option to disable https. Fixes #18.
Fixes #16.
Merge remote-tracking branch 'upstream/master'
Updated license file.
Merge pull request #21 from jbreitbart/master

Two fixes