adf`:wq
:
Merge remote-tracking branch 'github/master'

Conflicts:
	swipe/server.py
	swipe/server.pyc
got swipe.rpc to pass in paramiters