flattening history

I am flattening the whole commit history to remove private information
from the test data.
Merge remote-tracking branch 'viadeo/master'

Conflicts:
	.gitignore
	README.md