Reference things correctly for export.
Fix some broken #states code using a fancy OR logic.
Merge pull request #76 from jordandukart/7.x-fixes

Reference things correctly for export.