Fixing whitespace in swig templates, see #59
Merge branch 'master' of https://github.com/JedWatson/generator-keystone

Conflicts:
	app/templates/templates/default-swig/layouts/default.swig