Upgrade android-maven-plugin to 3.6.0

Newer versions of the Android SDK require a newer version of
android-maven-plugin:

http://stackoverflow.com/a/16998102

Changelog:

https://code.google.com/p/maven-android-plugin/wiki/Changelog
Ignore IntelliJ/Vim files
Merge branch 'android-maven-plugin-3.6.0' of git://github.com/andrewgaul/drag-sort-listview