adding sensor_dict and fixing some stuff
fix stuff and did sensor_dict additions
Merge branch 'master' of https://github.com/wetherbeei/SD2013-UIUC