Updated Netfpga Development Environment post
merge