fix syntax errors
use `whoami` for default db username
Merge branch 'master' of github.com:centresource/csrailstemplates