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
Update to OpenSSL 1.0.1j and Tor 0.2.5.9-rc
Update README
Merge pull request #17 from chrisballinger/dep-update

Update to OpenSSL1.0.1j and Tor 0.2.5.9-rc
Merge branch 'upstream' into GCDAsyncSocket

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