Ticket #8: Refactor connecto, can now handle username, password, host and port
Ticket #8, Refactor after connector class changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	giraffe/service/collector.py
revert last commit 06c436cc4e472b828ef3895f01697dcd908588c4