Update to work with support functions
Merge remote-tracking branch 'remotes/upstream/master' into pyfrc2015
Merge branch 'pyfrc2015' of https://github.com/sarosenb/pyfrc into pyfrc2015