First step in removing padrino.
Import dave's index and fix bugs from padrino migration