Moved attribute management to the necessary python scripts in lieu of
hardcoding.
Merge pull request #518 from rcythr/develop

Simple cleanup