updated Guardfile
entity minor cleanup
removed Entity#control
vector trivial cleanup