merge dev-quartus14 branch

Passes build test.  I approve.

http://hoopycat.com/bladerf_builds/8fc0e432bd6b7e230cc4751ae581a6df3c83473f/buildlog.txt