Minor refactor.
Reverted to autogen.sh.
Merge pull request #85 from flexiondotorg/master

Refactoring