adampatterson/Tentacle — pull request #193 by adampatterson (2013-09-15 06:19:29+00:00)
Title: Pulling in controller and model updates along with various fixes.

Brings in #192 and #185