hackign some networking in
Merge branch 'master' of https://github.com/matthewhinkle/bamf
some netwokring stuff and merging
merging
wokring on networking a touch