Remove IDEA stuff
Change spaces to tabs
Convert spaces to tabs
Merge branch 'master' into unix

Conflicts:
	.idea/misc.xml
	.idea/quamash.iml
	quamash/__init__.py