Change template behavior to match filename OR extension.
Merge branch 'master' of https://github.com/xesroche/bijou

Conflicts:
	bijou.cs
	bijou.exe