Roles re-ordering#609

ceb8 merged 2 commits intoastropy:mainastropy/astropy.github.com:mainfrom

pllim:reorder-rolespllim/astropy.github.com:reorder-rolesCopy head branch name to clipboard