Merge pull request TheComputerGeek2#372 from Chronoken/4.0

Cleanup

Merge pull request TheComputerGeek2#356 from JasperLorelai/4.0

Rollback

Merge pull request TheComputerGeek2#289 from Chronoken/4.0

Switch from spaces to tabs

Merge pull request TheComputerGeek2#217 from JasperLorelai/4.0

Changes for MS PAPI Expansion

Merge pull request TheComputerGeek2#199 from Chronoken/4.0

Beta 4

Merge pull request TheComputerGeek2#187 from Chronoken/4.0

Cleanup and bugfixes

Merge pull request TheComputerGeek2#185 from Chronoken/4.0

Bug fixes.

Merge pull request TheComputerGeek2#178 from DragonsAscent/master

Economy Fix, Descriptive errors, & more!

Move travis to trusty from xenial

Hopefully this will resolve the build problems

Merge pull request TheComputerGeek2#178 from DragonsAscent/master

Economy Fix, Descriptive errors, & more!