Update fabfile and prepare new deploy
Update tempaltes to be usable for now