took out fixme comment
updated Capfile and config files