Ai grading

The big merge to master!

@stephensanchez @gradyward @feanil  Please take a quick look if you get a chance.
Looks like two migrations numbered 0016 would it be easy to rename one, or is that just going to cause pain?