Fix tag following
Rename getToken() to get_token()
Merge branch 'streams' of https://github.com/Javafant/diaspora-api into streams

Conflicts:
	diaspy/streams.py
Changes in Client() initialization, changes in test suite (only one
connection is used now to speed stuff up)