Spec refactor

Minor refactorings, and move dependencies into the gemspec