Moved more stuff into gem, fixed load path issues
bumping version