cleansing
Merge branch 'master' of https://github.com/seejohnrun/ice_cube
Merge branch 'master' into international

Conflicts:
	.gitignore
propagating, some tests failing
fixing
fixed most tests
fixed fr locale, not quite right though