Cleaned up
Merge branch 'master' of github.com:jaredquinn/ohmy

Conflicts:
	ohmy.py