cleaned up and bootstrap files
Merge pull request #14 from jhendge/merger

cleaned up and bootstrap files
shteo
merging from master
auth working, cleaned some things up too