Merge in the latest updates to ui-router

Just pulled in the latest updates and resolved a few trivial conflicts.  Having default/optional parameter support is pretty nice.