7-28-2014 update

See readme
Merge remote-tracking branch 'origin/fermi' into fermi

Conflicts:
	README.md