Merge tag '1.5.3' into develop

1.5.3
Merge tag '1.5.4' into develop

1.5.4
create a user when deploying an app
per project trial duration, extending the trial on email confirmation
Merge branch 'feature/user-registration' into develop
added appsembler logo
working integration with shipyard 2.0 for single hostname apps
edx env variables adapted to shipyard 2.0
upgrade south
add Werkzeug so we can use runserver_plus.
Added local-nate.py settings file with my DB settings.
make launcher/shipyard work with hipache for routing
add redis requirement under base.txt
Merge branch 'feature/shipyard2.0' into develop
separated ansible playbook and vagrantfile into docker and launcher servers
docker role added
reorganized hosts
secret keys per environment
install pip on docker server as well
added docker pull module for ansible
dev domain added to allowed hosts