Merge pull request #12 from samdoshi/dev

Getting ready for rust 1.0