Removed netbeans project files as they don't belong in a gem
Improved code formatting
Merged with origin