almost through join logic
Merge branch 'master' of https://github.com/brandonmanson/abode into join-abode
updating files
merging Brandon's changes
Merge branch 'master' of https://github.com/brandonmanson/abode into join-abode
join works
Merge pull request #25 from brandonmanson/join-abode

Join abode