Fix Atom name conflicts on rust master
Fix deprecation warnings on rust master
Update docopt_macros to rust master
Merge pull request #21 from alexcrichton/update

Update to rust master