update
removing generated R files from tracking
merged master into db