UI Router Integration

I rebased onto current master, fixed a failing test, and looks like all should be well. Is there anything else needed to get this merged?