Added simple push thing to squelch warning
Added scroll wheel changes, GRAILS_OPT
Merge branch 'master' of https://github.com/NickCody/dotfiles

Conflicts:
	dotbashrc