More configuring
Merge branch 'master' of github.com:NateBarnes/albatross