Moved to development branch, updated submodules
Merge branch 'master' into development
Simplified Twig class
Fixed twig filter/functions namespacing
Fixed twig filter/functions namespacing
Merge branch 'development' of https://github.com/jameswestnz/branch into development
Fixed variable-based classes
Removed Timber plugin dependancy
No longer throw exception on empty config
Enabled timber caching if not in debug mode
Added timber
Merge branch 'master' into development

Conflicts:
	lib/vendor/jarednova/timber-library
Re-added timber
Merge branch 'development'