Changes to remove helloworld example leftovers, vi formatting stuff from maniacbug