Ugh
Fixed some stuff
No need for libconfig in travis
Stupid mistake
Merge pull request #742 from mannol1/master

Updated files with latest changes