Elixir's mix shouldn't be added to wrapProgram
pythonPackages.cvxopt: added package
python: make 2.6 and 2.7 expr similar, introduce includeModules

When includeModules is true, python is built with all optional modules
as part of derivation.
pythonFull -> python with all modules, pythonFullWithPkgs -> buildEnv
tagainijisho: new derivation

Tagaini Jisho is a free, open-source Japanese dictionary and kanji
lookup tool that aims at becoming your Japanese study assistant.

Homepage: http://www.tagaini.net/

Closes #4509
Update: trousers 0.3.11 -> 0.3.13
Add package: opencryptoki

Make tpm-tools depend on opencryptoki as well.
new perl package App::perlbrew with deps
strongswan: enable charon-cmd
pythonPackages.pycapnp: disable on py3k and pypy
amazon-image.nix: Pass --option build-users-group '' to nix tools to make Amazon generation work with nix-1.8+

(cherry picked from commit 654eaeb2ca709908b0e6fdcc8eabd3af6b3c0a5d)
Dohh

(cherry picked from commit b7451d91e8ecb70651fd2de81b2ec0faa8173aec)
titaniumsdk: Fix Titanium SDK 3.1 compatibility with the new Android SDK
Add pure-gsl package
Merge pull request #4514 from asppsa/pure-gsl5

Add pure-gsl package
Merge pull request #4510 from ts468/trousers

Update: trousers 0.3.11 -> 0.3.13
Add simulator for autonomous sailing boats
Merge pull request #4516 from kragniz/master

Add simulator for autonomous sailing boats
Update plasma-nm
Remove legacy pycharm version and rename the new one