Merge branch 'dev' of github.com:openaps/docs into dev

Merge further conflicts between master and dev.

Merge branch 'dev'

Merge master to dev (openaps#199)

I *think* I did this right

Merge pull request openaps#135 from openaps/dev

Dev to master