Update six to 1.5.2
ignore pycs, dist/, build/
Use nose 1.3
Merge branch 'master' into 118-int

Conflicts:
	.gitignore
Changelog update