Push cleanup

fixed 'setter and getter' style to be consistent with other files
added constants for grid width and height, among others
removed version numbers from Machine.add calls in master.ck