Merge into master from pull request #42:
Big pull request - mainly to get the loxi_ir changes in (https://github.com/floodlight/loxigen/pull/42)