conditionals removed
correct release tag in changelog
update for docker 0.11.1
update spec
update commit
update sources file
fix merge conflicts