Merge pull request #3 from ngbinh/master

Fix local directory
Merge pull request #4 from ngbinh/master

reverting to working state
Merge pull request #5 from ngbinh/master

supervisord and etcd
Merge pull request #6 from ngbinh/master

adding dist upgrade
Merge pull request #7 from ngbinh/master

another fix attempt
Merge pull request #8 from ngbinh/master

ok, we need to apt-get install first
Merge pull request #9 from ngbinh/master

clean up
etcd -> confd