swaps some defines for typed vars
Merge branch 'master' of github.com:TomRegan/pushy