Merge branch 'dev' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
Merge branch 'prod' of https://github.com/optimumsuave/mothership into prod
favicon stuff