add egg to install
goto 0.5.4-1
Merge branch 'dev'

Conflicts:
	setup.py
	timeside/__init__.py
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
fix various ReST links for pypi
goto 0.5.6