merge
:Merge branch 'master' of github.com:srnice/hbase-streaming

Conflicts:
	map.py