Fixed a couple of small bugs
Merge branch 'master' of git://github.com/MightyGorgon/icy_phoenix_styles
Removed trunk sub directory