file naming func
Merge branch 'master' of github.com:espena/sosicon

Conflicts:
	src/command_line.h
	src/sosi_north_east_ragel.cpp

Merging
fixed windows workarounds