Sorry -- I know it can be a challenge to get up to speed on git stuff.  Basically, try and keep each major feature separate, so that a pull request == an idea.  That way we can accept or reject things based specifically on the one feature, and avoid asking you to do too much reworking. :)