Merge of selendroid-feature branch & additional misc changes.

@krmahadevan @sebady Need your feedback on this one. I'd like to merge it soon but would appreciate some more eyes on it before I do so.