changed olsrd version to 0.6.5.4
Merge pull request #7 from opentechinstitute/olsrd-0.6.5.4

changed olsrd version to 0.6.5.4
added functionality for patches in luci-commotion
Merge pull request #8 from opentechinstitute/luci-commotion-wifi-patch

added functionality for patches in luci-commotion
fixed avahi-client version; fixed luci-commotion makefile whitespace; pushing since these break DR1 build
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:westbywest/commotion-feed
revert back to OTI olsrd Makefile