Merge branch 'master' of https://github.com/matadan/fab-template

Signed-off-by: Andrew Eades <andrew.eades@gmail.com>
Merge branch 'master' of https://github.com/matadan/fab-template