Reformat before manipulation
Ignore more Eclipse droppings
Upgrade proguard for Java 7 compatibility