Update gitignore, finally.
Merge branch 'master' of https://github.com/frc-1294/frc2013