Squashed commits for https://github.com/hoodiehq/hoodie-server/pull/286
Merge branch 'master' of github.com:timblack1/hoodie-server