Use short state declaration form
Unify requirement declarations

Requirements can be declared by referring to either a state id or the value of
its respective "name" attribute. This commit unifies usage in such a way that
only references to its "name" are made (as defined in map.jinja)
Merge pull request #14 from babilen/dev/style

Two stylistic changes