Merge pull request #5 from privatedata/master

Optimize stable-ubuntu14.04 Dockerfile
Propogate the design decisions from https://github.com/ansible/ansible-docker-base/pull/5 to the other images
Merge pull request #1 from ansible/master

merge from upstream