aliases edited

Merge branch 'master' of https://github.com/georgekick/aoristic

Conflicts:
	R/aoristic-package.R
	man/aoristic.Rd
Merge branch 'master' of https://github.com/georgekick/aoristic

Conflicts:
	R/aoristic-package.R
	man/aoristic.Rd
Merge branch 'master' of https://github.com/georgekick/aoristic

Conflicts:
	R/aoristic-package.R