Removed unecessary buildout parts
Added test dependencies into buildout.cfg
Replaced dict comprehension for python2.6 compatibility
Added support for Storm