Merge pull request #333.
authorJoshua Roesslein <jroesslein@gmail.com>
Sat, 17 Aug 2013 05:31:16 +0000 (22:31 -0700)
committerJoshua Roesslein <jroesslein@gmail.com>
Sat, 17 Aug 2013 05:31:16 +0000 (22:31 -0700)
Made a few changes and setup Travis config.


Trivial merge