Fixing gradle for Android Studio 1.0
Merge remote-tracking branch 'upstream/master'
Merge pull request #122 from samtstern/master

Updating to work with Android Studio 1.0