Merge branch 'develop' of github.com:moshea/foreman into develop

changing attributes to symbolic versions instead of direct method calls