Cleaned up site conf, fixed bootstrap (wasn't switching branches)