Beginning proper CSV import process
Merge branch 'master' of https://github.com/salmoni/Salstat

Conflicts:
	tmp/chartput.html
Ensuring that output can be displayed on Windows
Change to .gitignore