Clean up abilities a bit

Most of this was actually me alphabetizing these things. Nothing
special, and I may change this later depending on preference. (I may
group things differently)