Reformat.
Merge remote-tracking branch 'origin/development'

Conflicts:
	src/com/piindustries/picasino/PiCasino.java
Cleanup the master branch.  Please don't push any changes to this branch until we can all agree on the structure.