Merge pull request #47 from MartinSenne/master

Distributed worker and minor corrections.
Updated to scala version 2.11, akka to 2.3.3 and so forth.
Added concept__new with some ideas.
Added expansion code of macro.