Move .inc files into 'includes'.
Added a test.
Move Rules/Tokens files back into module folder as they don't appear to work otherwise.
Issue #2291063: use db_transaction() properly.
Merge branch 'feature/add-tests' into 7.x-1.x