Merge pull request #238 from damjanek/master

Add nova aggregates support