hand-modified notcompute.yaml
pushing passwords into mysql and other fixes
Merge branch 'MERGE' of https://github.com/SpamapS/templates into MERGE