merging in daniel's routes cleanup
merging in daniel's routes cleanup

tansaku/LocalSupport,SergiosLen/LocalSupport,intfrr/LocalSupport,decareano/LocalSupport,Aleks4ndr/LocalSupport,johnnymo87/LocalSupport,dsbabbar/LocalSupport,decareano/LocalSupport,tansaku/LocalSupport,davidbebb/local_support,curlygirly/LocalSupport,dsbabbar/LocalSupport,johnnymo87/LocalSupport,Aleks4ndr/LocalSupport,intfrr/LocalSupport,Aleks4ndr/LocalSupport,decareano/LocalSupport,curlygirly/LocalSupport,ZmagoD/LocalSupport,johnnymo87/LocalSupport,marianmosley/LocalSupport,SergiosLen/LocalSupport,davidbebb/local_support,curlygirly/LocalSupport,curlygirly/LocalSupport,tansaku/LocalSupport,ZmagoD/LocalSupport,ZmagoD/LocalSupport,intfrr/LocalSupport,Aleks4ndr/LocalSupport,dsbabbar/LocalSupport,SergiosLen/LocalSupport,davidbebb/local_support,SergiosLen/LocalSupport,dsbabbar/LocalSupport,davidbebb/local_support,marianmosley/LocalSupport,ZmagoD/LocalSupport,intfrr/LocalSupport,tansaku/LocalSupport,marianmosley/LocalSupport