Android + ultisnip fixes
Merge branch 'v2.0' of github.com:americandream/dotfiles into v2.0

Conflicts:
	home/.bashrc