local date changes
Merge branch 'master' of git://github.com/rackspace/stacktach

Conflicts:
	stacktach/views.py
local changes
Merge branch 'master' of git://github.com/rackspace/stacktach
Merge branch 'master' of git://github.com/rackspace/stacktach
Include transitions to error state
Merge pull request #46 from SandyWalsh/error_state

Error state