Merge branch 'hotfix/typedelete' into develop
ver 0.1.11
Added __version__ and __version_info__ to the library attr.
'compile' can now take MARDS text, filename, OR rolne.
change to setup.py version to accomadate Heroku
Merge branch 'release/0.1.14'

Conflicts:
	MARDS/__init__.py
	setup.py