When merging dicts, combine lists instead of overwriting
Upload to PyPi task, as well as slight tweaks for paths
Small typo in comments
Controllers added to container no longer require 'item' to be set, and will use the qualified name of the controller
Bumped to 0.2.5
Merge branch 'develop'
Accidentally added py.test to requirements
Merge branch 'develop'