fix source specifications for ELPA + minor style fixes
Merge pull request #1 from boegel/ELPAnew

fix source specifications for ELPA + minor style fixes