set up my own s3 repo and made a post called 'Proteus'
Merge branch 'master' of git://github.com/voidfiles/Issues

Conflicts:
	Rakefile
local stuff
awesome
all untracked files