Removing angular-ui-router

Also getting develop caught up to master.