Add wmertens to maintainers
Monit: Bump to 5.8

- Use callPackage etc
- Make PAM optional
cccc: New package 3.1.4
Fix OpenSSL requirement
Move non-java libraries to "DEVELOPMENT / LIBRARIES" section
Add ori, a secure distributed filesystem.
cabal2nix derivation for haskellPackages.fayText
Merge pull request #2645 from vandenoever/ori.

Add ori, a secure distributed filesystem.
Add -p to mkdir in build-fhs-chrootenv to prevent error if directory exists
libmodplug: update to 0.8.8.5
syncthing: update to version 0.8.5
haskell-glfw-b: add package version 1.4.6
Merge pull request #2656 from hrdinka/haskell-glfw-b

haskell-glfw-b: add package version 1.4.6
Merge branch 'monit-5.8' of github.com:wmertens/nixpkgs
git: Update to 1.9.3
Register expression for fay-text in catalog.
Merge pull request #2647 from crooney/master

cabal2nix derivation for haskellPackages.fayText
rxvt-unicode: update to 9.20, fixing CVE-2014-3121 (close #2649)
mesa: small bugfix update 10.1.2 -> .3

Mainly fixes performance regression for vmware.
llvm+clang: maintenance update 3.4 -> 3.4.1

Slightly hacky for clang at some points, as directory names change strangely.