Update and change from markdown to restructured text
Merge branch 'develop' of https://github.com/bneg/bitmask_client into develop