Merge pull request #1 from nightscout/master

pr
Rough outline of DIYPS functions with refactored carb algorithms
add note on how we're modifying the AR algorithm in commit bb521d0
Merge branch 'release/0.5.0' into dev
Merge pull request #4 from nightscout/master

pull
Merge pull request #227 from scottleibrand/dev

add note on how we're modifying the AR algorithm in commit bb521d0
Smaller alarms

No longer stereo, lower bit rate. They could also be shortened as they
are looped. Now 140k instead of 500+.
Size now 65k, cut at loop point.
Merge pull request #5 from nightscout/master

update
add option to host over ssl
make paths relative
Merge wip/add-ssl (and everything it inherited from dev) into wip/iob-cob
fix, only include ssl ca file if one is listed
Merge branch 'master' into dev
Revert "make paths relative"

This reverts commit 7bd2247544be32b8a37dffea3bcd025f4095f492.
Merge branch 'wip/add-ssl' of https://github.com/nightscout/cgm-remote-monitor into nightscout-wip/add-ssl

Conflicts:
	env.js
	static/js/client.js
Merge branch 'nightscout-wip/add-ssl' into wip/iob-cob
disable websockets for now, causing more trouble then it's worth
Merge branch 'master' into wip/iob-cob
Changed collection name from nightscout to entries in app.json