m-labs
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ before_install:
   - . ./.travis/get-toolchain.sh
   - . ./.travis/get-anaconda.sh
   - source $HOME/miniconda/bin/activate py34
-  - conda install -q pip coverage binstar migen cython
+  - conda install -q pip coverage anaconda-client migen cython
   - pip install coveralls
 install:
   - conda build conda/artiq
@@ -25,9 +25,9 @@ script:
   - coverage run --source=artiq setup.py test
   - make -C doc/manual html
 after_success:
-  - binstar -q login --hostname $(hostname) --username $binstar_login --password $binstar_password
-  - binstar -q upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2
-  - binstar -q logout
+  - anaconda -q login --hostname $(hostname) --username $binstar_login --password $binstar_password
+  - if [ "$TRAVIS_BRANCH" == "master" ]; then anaconda -q upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2; fi
+  - anaconda -q logout
   - coveralls
 notifications:
   email:

diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 
 export PATH=$HOME/miniconda/bin:$PATH
 wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
@@ -9,5 +10,4 @@ conda update -q conda
 conda info -a
 conda install conda-build jinja2
 conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION
-conda config --add channels fallen
-conda config --add channels https://conda.anaconda.org/fallen/channel/dev
+conda config --add channels https://conda.anaconda.org/m-labs/channel/dev
diff --git a/.travis/get-toolchain.sh b/.travis/get-toolchain.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 packages="http://us.archive.ubuntu.com/ubuntu/pool/universe/i/iverilog/iverilog_0.9.7-1_amd64.deb"
-archives="http://fehu.whitequark.org/files/binutils-or1k.tbz2 http://fehu.whitequark.org/files/llvm-or1k.tbz2"
+archives="http://fehu.whitequark.org/files/llvm-or1k.tbz2"
 
 mkdir -p packages
 
@@ -21,8 +21,8 @@ done
 export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:$PATH
 export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:$LD_LIBRARY_PATH
 
-echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh
-echo "export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PATH" >> $HOME/.mlabs/build_settings.sh
+echo "export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:\$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh
+echo "export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:\$PATH" >> $HOME/.mlabs/build_settings.sh
 
 or1k-linux-as --version
 llc --version

diff --git a/.travis/get-xilinx.sh b/.travis/get-xilinx.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) 2014, 2015 M-Labs Limited
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 
 wget http://sionneau.net/artiq/Xilinx/xilinx_ise_14.7_s3_s6.tar.gz.gpg
 echo "$secret" | gpg --passphrase-fd 0 xilinx_ise_14.7_s3_s6.tar.gz.gpg

diff --git a/CONTRIBUTING b/CONTRIBUTING
@@ -0,0 +1,46 @@
+Authors retain copyright of their contributions to ARTIQ, but whenever possible
+should use the GNU GPL version 3 license for them to be merged.
+
+Works of US government employees are not copyrighted but can also be merged.
+
+We've introduced a "sign-off" procedure on patches that are being sent around.
+
+The sign-off is a simple line at the end of the explanation for the
+patch, which certifies that you wrote it or otherwise have the right to
+pass it on as an open-source patch.  The rules are pretty simple: if you
+can certify the below:
+
+        Developer's Certificate of Origin (1.1 from the Linux kernel)
+
+        By making a contribution to this project, I certify that:
+
+        (a) The contribution was created in whole or in part by me and I
+            have the right to submit it under the open source license
+            indicated in the file; or
+
+        (b) The contribution is based upon previous work that, to the best
+            of my knowledge, is covered under an appropriate open source
+            license and I have the right under that license to submit that
+            work with modifications, whether created in whole or in part
+            by me, under the same open source license (unless I am
+            permitted to submit under a different license), as indicated
+            in the file; or
+
+        (c) The contribution was provided directly to me by some other
+            person who certified (a), (b) or (c) and I have not modified
+            it.
+
+        (d) I understand and agree that this project and the contribution
+            are public and that a record of the contribution (including all
+            personal information I submit with it, including my sign-off) is
+            maintained indefinitely and may be redistributed consistent with
+            this project or the open source license(s) involved.
+
+then you just add a line saying
+
+	Signed-off-by: Random J Developer <random@developer.example.org>
+
+using your legal name (sorry, no pseudonyms or anonymous contributions.)
+
+ARTIQ files that do not contain a license header are copyrighted by M-Labs Limited
+and are licensed under GNU GPL version 3.