added AES crypt
fixed requested changes
Merge pull request #685 from qknight/aescrypt

added AES crypt with fixes from edolstra
linux: Update to 3.2.48, 3.4.51
Remove redundant cifs option
darktable: Update to 1.2.2
plone: updating 4.3.0 to 4.3.1, minor renaming of nix files
plone: z3c.form downgraded to 3.0
plone: plone_recipe_varnish updated to 1.3dev to support varnish >= 3
haproxy: update to 1.4.24 (set platform to linux, for now)
pythonPackages.genshi: update to 0.7
plone: adding collective_recipe_template package
plone: adding collective_recipe_filestorage package
emacs24: fix build on darwin
liboil: fix build on darwin

* force --build=x86_64
meta.license is a list of strings (not attribute sets)

http://hydra.nixos.org/build/5453648
gnome.ORBit2: fix build on darwin

* add libintlOrEmpty to build inputs
cracklib: fix build on darwin

* add libintlOrEmpty to build inputs
glib: remove unnecessary restrictions on darwin
gobject-introspection: fix build on darwin

* add otool expression (add otool to build inputs)
* add libintlOrEmpty to build inputs