fixing broken things
Merge branch 'master' of github.com:JGrubb/plantright