fixes rsyncing version control (#22) and includes #16 patch too

Sorry...didn't realize these branches wouldn't work so great together