Modernized the structure

This brings the gem more up to speed to what it would look like if we
were to create it with `bundle gem`.
Test belongs_to :with_deleted => true