Added android and maven support
Merge branch 'master' of github.com:monolar/dotfiles