removed pyamf, json added
pack size test added
socket_server.http removed and socket_server.collector added
removed socket_server.http from setup.py
.travis.yml added, setup.py with requirements
Makefile added
Merge branch 'collector' into json

Conflicts:
	socket_server/test/zt_packer.py
removed pyamf from requires
Merge pull request #3 from dsociative/json

Json