Merge pull request #1887 from berdario/vagrant

Updated vagrant to 1.4.3
Merge branch 'pew' of git://github.com/berdario/nixpkgs

Added Pew (and misc. related changes)

Conflicts:
	pkgs/top-level/python-packages.nix
Merge branch 'master' of git://github.com/esterlus/nixpkgs

added telegram-cli as instant-messenger application
Merge branch 'desktopmanager-fix' of git://github.com/pSub/nixpkgs

Use feh only as a fallback if the xserver is actually enabled.
Merge branch 'pipes-binary' of git://github.com/klao/nixpkgs

Add lens-family-core and pipes-binary Haskell packages
Merge pull request #1861 from ttuegel/pcmanfm

Add pcmanfm-1.2.0
Merge pull request #1860 from jagajaga/dwb_update

dwb: update version
Merge pull request #1787 from larkery/master

Fix obex-data-server so it builds
Merge pull request #959 from wizeman/vimrc

vim: add config option to generate global vimrc
Merge pull request #1862 from matejc/fixtorbrowser

fix torbrowser build by adding /lib64 for 64 bit systems
Merge pull request #1833 from coreyoconnor/fix-synaptics-config

correct tapButtons in synaptics config.
Merge pull request #1855 from kirelagin/master

Add Symbola font
Merge pull request #1821 from AndersonTorres/master

8086tiny: new package
Merge pull request #1825 from iyzsong/gradle

gradle: update to 1.11
Merge pull request #1817 from wkennington/cache.wpasupplicant

wpa_supplicant: Update 2.0 -> 2.1
dfu-programmer: New package.
leiningen: Hardcode path to java.

...by setting JAVA_CMD in the wrapper.
Merge pull request #1704 from iyzsong/guile-xcb

add guile-xcb 1.3
Merge pull request #1322 from zimbatm/no-ruby18

WIP: Request to remove ruby 1.8 from the tree
Merge pull request #1729 from iyzsong/portaudio

portaudio: update to v19_20140130