Updating .mst_profile
Resolving merge conflict in settings file
Merge branch 'master' of https://github.com/wazzuck/vunderland