removed commented out code
merged
gems updated