Merge pull request #6 from hoosteeno/master

Add better development infrastructure.