Pull natty changes into devel

Original PR and comments here - https://github.com/getlantern/flashlight/pull/44