Migrating options
Merge branch 'fresh' of github.com:aristath/shoestrap into fresh