Changes to test csv files
Merge branch 'master' of https://github.com/dhenderson/paperpusher

Conflicts:
	paperpusher/tests/test_files/test.csv