Get rid of weird startup jerkiness and ghosts.
Merge branch 'master' of https://github.com/smelendez/axion