removed deprecated roxyten keys and fixed rdoc syntax errors
merging