Merge remote-tracking branch 'rod/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
AndroidApp: Add preferences UI for configuring Psiphon parameters. Add Quit command.
Created Docker build image for Go-Android library.

Also updated BuildTools version to match version in build image. Note that AndroidApp/make.bash doesn't work yet.
Use Java 7 in build image. App now builds in image.
Added 'all' and 'verbose' flags to build command
Added some suggested items to gitignore. Committing cleaner version of some Android Studio files.
Merge pull request #42 from adam-p/master

Create Docker image for building Android Go library
Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core
Merge pull request #43 from rod-hynes/master

AndroidApp: Add preferences UI for configuring Psiphon parameters. Add Quit command.
Fix: bindLookupIP now simply echos back its input when it's already an IP address
Merge pull request #45 from rod-hynes/master

Fix: bindLookupIP now simply echos back its input when it's already an IP address
Enable Travis CI
Merge pull request #46 from rod-hynes/master

Enable Travis CI
Display Travis build status
Merge pull request #47 from rod-hynes/master

Display Travis build status