Updating org-mode to 8.2.1
Merge pull request #1031 from pSub/org-mode-update

Updating org-mode to 8.2.1
mu: update to 0.9.9.5

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
phantomjs: add openssl to rpath
Merge pull request #1033 from lovek323/phantomjs

phantomjs: add openssl to rpath
Move all of NixOS to nixos/ in preparation of the repository merge
Merge the NixOS repository into Nixpkgs
Move pkgs/lib/ to lib/
Fix references to pkgs/lib
Unify the Nixpkgs and NixOS version numbers
Update the release expressions and the channel generators
nixos-checkout: Only fetch the Nixpkgs repo
Merge .gitignore files