general cleanup and normalization
update specs/features using deprecated syntax
Merge pull request #1 from miquella/cleanup

Cleanup and updating to latest gems