Fixes template's tags alignment

Tags were not in the right place.
Merge branch 'master' into feature/fix-docoptargs

Conflicts:
	docopt_c.py
Merge pull request #15 from ffunenga/feature/fix-docoptargs

Fixes template's tags alignment