Fixed basis set ordering for Stefan.
Merge branch 'develop' of repo.ctcc.no:gimic into develop

Conflicts:
	tools/turbo2gimic.py.in