added todos
upgraded six to deal with mysterious dependency issue with paster