Myriad of bug fixes and improvements.
Travis failures.
Unused var.
Merge pull request #51 from jordandukart/7.x

Myriad of bug fixes and improvements.