Auto-format

Also provided eclipse settings for formatting, for general hilarity