[macros] Allow model names with spaces.

Signed-off-by: Marko Saukko <marko.saukko@jollamobile.com>
Merge pull request #11 from saukko/key-value

[macros] Allow model names with spaces.