Included mock library in dependencies.
Prettier code in twitter.
Tried to fix a conflict.

A duplicate line was commited in two different branches.
Merge branch 'lint'

Conflicts:
	setup.py