Added some modules and support for android and yaml
Merge branch 'master' of github.com:mizhi/dot-emacs