changed meters
commented out a bunch of osx stuff I dont use/know
Merge branch 'master' of https://github.com/markmossberg/dotfiles
android path