Update form upstream with ade25 blueprint templates
Add ignore file and update fabfile