Updating and fixing code.

Getting this thing ready for release basically. It is still going to be
a bit buggy, but just throw it in the issues and I will keep building
it.
Merge branch 'master' of https://github.com/mikehuebner/swctallax

Conflicts:
	README.md