linting
Merge branch 'master' of github.com:EndPointCorp/interactivespaces-python-api

Conflicts:
	interactivespaces/activity.py
	interactivespaces/master.py