Fixed a couple bugs. Tests now pass. Travis config updated