Updates
Merge branch 'master' of github.com:unhaltable/txti

Conflicts:
	initializer.py
Connect SMS to the parser