fixed up some checkstyle warnings for the stuff in entities folder.  Also updated IDE to use spaces for indentation.