Merge pull request #218 from nightscout/dev

Improvement in the X axis when viewing in 24 mode
Adding a Robots.txt to hide NightScout from Google
Merge pull request #224 from shanselman/wip/robotstxt

Adding a Robots.txt to hide NightScout from Google
Revert "Adding a Robots.txt to hide NightScout from Google"
In the right location
Merge pull request #226 from shanselman/revert-224-wip/robotstxt

Correct location - Adding a Robots.txt to hide NightScout from Google
Merge pull request #225 from nightscout/dev

Add robots.txt
Merge pull request #207 from nightscout/release/0.5.0

Cookie Monster (0.5.0)
Merge branch 'release/0.5.0'
Merge branch 'master' of github.com:nightscout/cgm-remote-monitor
disable websockets for now, causing more trouble then it's worth
version bumps
Merge pull request #239 from nightscout/hotfix/disable-websockets

disable websockets for now, causing more trouble then it's worth
Merge pull request #4 from nightscout/master

Update fuddster/dev