Removed no longer necessary options and twig functions in favour of theming support
Merged fsi/datasource-bundle into master
Merged fsi/datasource-bundle into master
Merged in chives/datasource-bundle (pull request #2)

Removed no longer necessary options and twig functions in favour of theming support