Trailing whitespace cleanup
Do not select Swift proxy node as storage node

When one node had a controller role set, it was
select as storage node as well. Skip it, to preserve
behavior of non-role layout.
Merge pull request #250 from dirkmueller/master

Fix allocation issues when a role is set