Merge remote-tracking branch 'davidchiles/bootstrap-progress'
Add methods to retreive dependency versions
Use xcpretty instead of xctool for Travis builds
Change URLs in readme from fork to original repo
Merge pull request #14 from ChatSecure/master

Configurable Tor path #9 and completion/progress block for setup #11
Merge branch 'upstream' into GCDAsyncSocket

Conflicts:
	CPAProxy/CPAProxyManager.h
	CPAProxy/CPAProxyManager.m