modularization continuing
Getting updates to Devin's code

Merge branch 'master' of https://github.com/Marist-OpenFlow/floodlight-dangerzone
Trying to configure my flow stuff
Nothing crazy

Merge branch 'master' of https://github.com/Marist-OpenFlow/floodlight-dangerzone