reverted some changes to study conf that had broken abbreviations.
Merge pull request #326 from Tietoarkisto/master

reverted some changes to study conf that had broken abbreviations.