improved grunt workflow

templating is currently broken due to restructurings