Slightly optimized.
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/templates/Natasha2014.java
	src/edu/wpi/first/wpilibj/templates/Tail.java