Added missing @Override annotations with Eclipse
Deleted unused imports
Merge remote-tracking branch 'upstream/rv2' into rv2
Fixed some warnings about unnecessary code
Deleted unnecessary casts with Eclipse
Merge remote-tracking branch 'upstream/rv2' into rv2
Merge remote-tracking branch 'upstream/rv2' into rv2

Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java
Deleted some parens and fixed indentation
Merge pull request #171 from iloveportalz0r/rv2

Fixed lots of warnings (mostly redundant code)