Changed version number
Merge branch 'development'

Conflicts:
	VERSION
hopefully cleaned up method for cleaning strings
fixed missing parens
Merge branch 'development'
Merge branch 'development'
Fun with indentation in python