Merge branch 'master' into nitrogen
Merge branch 'master' into typespeed
Merge branch 'nitrogen' into typespeed
Oops, got nitrogen and typespeed branches mixed up.
Removed unneeded builder.sh.
hdevtools compiles
Add MFlow and dependencies
Fixed problem with worddir and ruledir path.
Oops, forgot to add patch.
Added metadata for typespeed.
Merge pull request #2872 from wkennington/master.kernel

Kernel 3.15 Update
Oops, removed a printf debug line we don't need.
Merge pull request #2866 from scubed2/fceux

fceux: Add package for a NES emulator.
Merge pull request #2861 from bflyblue/master

Fix sabnzbd and update to latest version
Merge pull request #2858 from offlinehacker/nixos/atom/add

Add github atom, a hackable text editor for the 21st Century
Added auntie as a maintainer, and set license properly.
Merge pull request #2838 from wkennington/master.isoname

nixos-iso: Use a simpler disk label
Merge pull request #2810 from letac/raco

raco pkg install ... is not throwing ssl error anymore
Added license for kochi-substitute font.
compcert: fix build by adding menhir dependency

Signed-off-by: Austin Seipp <aseipp@pobox.com>