Merge pull request #274 from khawkins/bootstrap_updates

Merging native/auth refactor into bootstrap_updates
Some in-progress refactoring