Modified uptimetpl to distinguish between plural and singular cases. Began
work on Host functionality
Standard Merge

Merge branch 'master' of https://github.com/Marist-OpenFlow/floodlight-dangerzone
minor changes to uptime template
Nothing special about this merge!

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