Separate loci and associate them with senses.

Closes #121.
Merge pull request #144 from Muskwalker/master

Separate loci and associate them with senses.