Changes from local version

I don't remember what they all were. Generally, I think it was to make it compile with Java 1.7 and allow ":" in variable names.