pull in guard
generalizing and testing results
rename the Bootstrap migration to avoid conflicts with Bootstrap proper

and some other cleanup