rm unused substitution rules; mv import statement down
explicit imports (m.)
Merge branch 'master' of github.com:vote-cy/vote-cy