removed function inclusion and updated config
bugfix, wrong neos rewrites
Merge pull request #56 from wick-ed/master

reviewed diff and tested locally with 0.6.0